diff --git a/configuration.nix b/configuration.nix index ca4a3ca..b6d2b22 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,23 +5,24 @@ { config, pkgs, ... }: { - imports = [ - ./modules/colors.nix + imports = + [ + ./modules/colors.nix - # Include the results of the hardware scan. - ./hardware-configuration.nix + # Include the results of the hardware scan. + ./hardware-configuration.nix - ./roles/admin.nix - ./roles/base.nix - ./roles/desktop.nix - ./roles/dev.nix - ./roles/mail.nix - ./roles/network.nix - ./roles/nix.nix - ./roles/vpn.nix - ./roles/private.nix - ./roles/game.nix - ]; + ./roles/admin.nix + ./roles/base.nix + ./roles/desktop.nix + ./roles/dev.nix + ./roles/mail.nix + ./roles/network.nix + ./roles/nix.nix + ./roles/vpn.nix + ./roles/private.nix + ./roles/game.nix + ]; networking.useDHCP = false; @@ -31,7 +32,9 @@ services.openssh.enable = true; networking.firewall.enable = true; - nixpkgs.config.permittedInsecurePackages = [ "openssl-1.0.2u" ]; + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.0.2u" + ]; system.autoUpgrade.enable = true; system.stateVersion = "20.03"; # We can stay here diff --git a/dotfiles/sway/config b/dotfiles/sway/config index b3bd122..b14990e 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -7,7 +7,7 @@ set $right l set $term alacritty set $wallpaper /home/stefan/Downloads/bg.jpg set $lock swaylock -t -i $wallpaper --scaling=fill -set $font CaskaydiaCove Nerd Font 10 +set $font pango:CaskaydiaCove Nerd Font Mono 10 set $menucolor --ff=#f8f8f2 --nf=#f8f8f2 --tf=#bd93f9 --hf=#bd93f9 --tb=#282a36 --fb=#282a36 --nb=#282a36 --hb=#282a36 --sb=#282a36 set $menu bemenu-run -H 23 -b -p run $menucolor @@ -116,7 +116,6 @@ mode "resize" { bindsym $mod+r mode "resize" bar { - font $font position bottom colors { background $black @@ -134,8 +133,8 @@ bar { set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Dracula' - gsettings set $gnome-schema icon-theme 'Dracula' + gsettings set $gnome-schema gtk-theme 'Arc-Dark' + gsettings set $gnome-schema icon-theme 'elementary Xfce' gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White' } @@ -147,7 +146,6 @@ exec mako --font "$font" \ exec emacs --daemon exec swayidle before-sleep "$lock" exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1 -exec redshift -l 49.8988135:10.9027636 # pastebin exec wl-paste --primary -t text --watch clipman store diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml index 60ef6eb..18b43e2 100644 --- a/dotfiles/sway/status.toml +++ b/dotfiles/sway/status.toml @@ -23,25 +23,22 @@ backlight_full = "" backlight_partial1 = "" backlight_partial2 = "" backlight_partial3 = "" -bat = "" -bat_charging = "" -bat_discharging = "" -bat_empty = "" -bat_quarter = "" -bat_half = "" -bat_three_quarters = "" -bat_full = "" -cogs = "龍" -disk_drive = "" +bat = "" +bat_charging = " " +bat_discharging = "" +bat_empty = "" +bat_full = "" +cogs = "" +disk_space = "" headphones = "  " -memory_mem = "" +memory_mem = "" net_down = "DOWN" net_up = "UP" net_vpn = " " net_wired = "" net_wireless = " " thermometer = "  " -time = "" +time = "" volume_empty = "" volume_full = "" volume_half = "" @@ -67,9 +64,9 @@ command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2) [[block]] block = "disk_space" path = "/" +alias = " /" info_type = "available" unit = "GB" -format = "{icon} {available}" interval = 20 warning = 20.0 alert = 10.0 @@ -98,7 +95,6 @@ block = "battery" device = "BAT0" interval = 10 format = "{percentage} ({time})" -full_format = "{percentage} ({time}) " icons_format = " {icon} " [[block]] @@ -106,7 +102,6 @@ block = "battery" device = "BAT1" interval = 10 format = "{percentage} ({time})" -full_format = "{percentage} ({time}) " icons_format = " {icon} " [[block]] diff --git a/hardware/desktop.nix b/hardware/desktop.nix index 2a90d89..4672412 100644 --- a/hardware/desktop.nix +++ b/hardware/desktop.nix @@ -3,30 +3,32 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: -let unstable = import { config.allowUnfree = true; }; +let + unstable = import { config.allowUnfree = true; }; in { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "tank/root/nixos"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "tank/root/nixos"; + fsType = "zfs"; + }; - fileSystems."/home" = { - device = "tank/root/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "tank/root/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/587C-36F9"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/587C-36F9"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/hardware/vison14.nix b/hardware/vison14.nix index 08620c6..cf4b406 100644 --- a/hardware/vison14.nix +++ b/hardware/vison14.nix @@ -3,40 +3,43 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: -let - tuxedo-keyboard = - pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) { }; - tuxedo-cc = - pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) { }; +let + tuxedo-keyboard = pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) {}; + tuxedo-cc = pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) {}; in { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ tuxedo-keyboard ]; - environment.systemPackages = with pkgs; [ tuxedo-cc ]; + boot.extraModulePackages = [ + tuxedo-keyboard + ]; + environment.systemPackages = with pkgs; [ + tuxedo-cc + ]; - fileSystems."/" = { - device = "private/root/nixos"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "private/root/nixos"; + fsType = "zfs"; + }; - fileSystems."/home" = { - device = "private/root/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "private/root/home"; + fsType = "zfs"; + }; - fileSystems."/tmp" = { - device = "private/root/tmp"; - fsType = "zfs"; - }; + fileSystems."/tmp" = + { device = "private/root/tmp"; + fsType = "zfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7E36-C774"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7E36-C774"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/hardware/x220-discovery.nix b/hardware/x220-discovery.nix index a871c3f..3e321ac 100644 --- a/hardware/x220-discovery.nix +++ b/hardware/x220-discovery.nix @@ -3,37 +3,32 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: -let unstable = import { config.allowUnfree = true; }; +let + unstable = import { config.allowUnfree = true; }; in { - imports = [ ]; + imports = + [ + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "cube/root/nixos"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "cube/root/nixos"; + fsType = "zfs"; + }; - fileSystems."/home" = { - device = "cube/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "cube/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2AD7-4F18"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2AD7-4F18"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/hardware/x360-raven.nix b/hardware/x360-raven.nix index d3b6ff4..19cca78 100644 --- a/hardware/x360-raven.nix +++ b/hardware/x360-raven.nix @@ -3,7 +3,8 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: -let unstable = import { config.allowUnfree = true; }; +let + unstable = import { config.allowUnfree = true; }; in { imports = [ @@ -18,8 +19,14 @@ in { "w /sys/class/drm/card0/device/power_dpm_force_performance_level - - - - low" ]; - boot.initrd.availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.extraModulePackages = [ ]; boot.kernelModules = [ "kvm-amd" ]; @@ -28,6 +35,7 @@ in { boot.kernelPackages = unstable.linuxPackages_latest; #boot.kernelPackages = unstable.linux_testing; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -37,20 +45,20 @@ in { networking.interfaces.wlo1.useDHCP = true; networking.resolvconf.useLocalResolver = true; - fileSystems."/" = { - device = "tank/root/nixos"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "tank/root/nixos"; + fsType = "zfs"; + }; - fileSystems."/home" = { - device = "tank/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "tank/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/B048-FBC8"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/B048-FBC8"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/hardware/xps15-sphere.nix b/hardware/xps15-sphere.nix index 8b5d78b..40a4213 100644 --- a/hardware/xps15-sphere.nix +++ b/hardware/xps15-sphere.nix @@ -3,13 +3,15 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: -let unstable = import { config.allowUnfree = true; }; +let + unstable = import { config.allowUnfree = true; }; in { - imports = [ ]; + imports = + [ + ]; boot.extraModulePackages = [ ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.kernelParams = [ "intel_pstate=active" ]; @@ -24,26 +26,26 @@ in { enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 + vaapiIntel # LIBVA_DRIVER_NAME=i965 vaapiVdpau libvdpau-va-gl ]; }; - fileSystems."/" = { - device = "tank/work/nixos"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "tank/work/nixos"; + fsType = "zfs"; + }; - fileSystems."/home" = { - device = "tank/work/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "tank/work/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/DC7B-5E2D"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DC7B-5E2D"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/packages/certmanager.nix b/packages/certmanager.nix index aa82002..cc23228 100644 --- a/packages/certmanager.nix +++ b/packages/certmanager.nix @@ -1,15 +1,16 @@ -with import { }; +with import {}; stdenv.mkDerivation rec { name = "cert-manager"; version = "v1.7.1"; src = fetchurl { - url = - "https://github.com/cert-manager/cert-manager/releases/download/${version}/cmctl-linux-amd64.tar.gz"; + url = "https://github.com/cert-manager/cert-manager/releases/download/${version}/cmctl-linux-amd64.tar.gz"; sha256 = "1z5n2rcfhrl1vm5vxqa1759m3prlv08mmg96n16p4gwkdxycznx4"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' tar xvpzf $src diff --git a/packages/cloudstation.nix b/packages/cloudstation.nix index 3196d59..d47ee2b 100644 --- a/packages/cloudstation.nix +++ b/packages/cloudstation.nix @@ -1,14 +1,22 @@ -{ stdenv, buildFHSUserEnv, fetchurl, lib, pkgs, writeScript }: +{ stdenv +, buildFHSUserEnv +, fetchurl +, lib +, pkgs +, writeScript +}: let version = "4.3.3"; release = "4469"; cloudstation = stdenv.mkDerivation rec { name = "cloudstation-unpack"; - buildInputs = [ pkgs.dpkg pkgs.qt5.qtbase ]; + buildInputs = [ + pkgs.dpkg + pkgs.qt5.qtbase + ]; src = fetchurl { - url = - "https://global.download.synology.com/download/Tools/CloudStationDrive/${version}-${release}/Ubuntu/Installer/x86_64/synology-cloud-station-drive-${release}.x86_64.deb"; + url = "https://global.download.synology.com/download/Tools/CloudStationDrive/${version}-${release}/Ubuntu/Installer/x86_64/synology-cloud-station-drive-${release}.x86_64.deb"; sha256 = "0v84yb70knmmjzp7lyn6jgy5bnfsfd47wmqh29phybqg4zk3d47j"; }; unpackPhase = '' @@ -27,32 +35,31 @@ let dontWrapQtApps = true; }; + in buildFHSUserEnv { name = "cloudstation"; - targetPkgs = pkgs: - with pkgs; - with xorg; [ - cloudstation - curl - dbus_libs - fontconfig - freetype - glib - libICE - libSM - libX11 - libxcb - openssl - qt5.qtbase - qt5.qttools - qt5.qtwayland - qt5.qtx11extras - sqlite - stdenv.cc.cc.lib - xkeyboard_config - zlib - ]; + targetPkgs = pkgs: with pkgs; with xorg; [ + cloudstation + curl + dbus_libs + fontconfig + freetype + glib + libICE + libSM + libX11 + libxcb + openssl + qt5.qtbase + qt5.qttools + qt5.qtwayland + qt5.qtx11extras + sqlite + stdenv.cc.cc.lib + xkeyboard_config + zlib + ]; runScript = writeScript "cloudstation" '' #!/usr/bin/env bash diff --git a/packages/helm2.nix b/packages/helm2.nix index ebd69e7..93b18ae 100644 --- a/packages/helm2.nix +++ b/packages/helm2.nix @@ -1,4 +1,4 @@ -with import { }; +with import {}; stdenv.mkDerivation rec { name = "helm2"; @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' tar xvpzf $src diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix index 85a5b08..0554e39 100644 --- a/packages/nagstamon.nix +++ b/packages/nagstamon.nix @@ -5,7 +5,7 @@ python38Packages.buildPythonApplication rec { version = "3.7.0-alpha"; src = fetchFromGitHub { - owner = "HenriWahl"; + owner = "HenriWahl"; repo = "Nagstamon"; rev = "dba37dc034589dfb312c6e8a7cc768bcd1952db9"; sha256 = "1l095halb55qinaik51p3lxiln1s034dr28k7ra6xzrrv9l1x1xw"; diff --git a/packages/neovim.nix b/packages/neovim.nix index 3cbe234..f1744dd 100644 --- a/packages/neovim.nix +++ b/packages/neovim.nix @@ -1,4 +1,4 @@ -with import { }; +with import {}; neovim.override { vimAlias = true; @@ -72,7 +72,7 @@ neovim.override { noremap ff :FZF noremap fn :NnnPicker %:p:h noremap fc :saveas %:p:h - + let g:which_key_map.y = { 'name': '+yank' } noremap yp :read !wl-paste noremap yy :read !wl-paste @@ -84,7 +84,7 @@ neovim.override { noremap bd :bd noremap bn :bn noremap bp :bp - + let g:which_key_map.m = { 'name': '+lang' } noremap md :call LanguageClient_textDocument_codeAction() noremap mc :call LanguageClient#textDocument_references() diff --git a/packages/notcoal/default.nix b/packages/notcoal/default.nix index 7a17f70..cb99f47 100644 --- a/packages/notcoal/default.nix +++ b/packages/notcoal/default.nix @@ -5,14 +5,20 @@ rustPlatform.buildRustPackage rec { version = "0.3.0"; src = fetchTarball { - url = "https://ghom.niij.org/eaon/notcoal/archive/v0.3.0.tar.gz"; + url = https://ghom.niij.org/eaon/notcoal/archive/v0.3.0.tar.gz; sha256 = "19gaba6asid5vplcy9q0ama40dvwwxglc40ks5240lydrvgfrimq"; }; - cargoPatches = [ ./Cargo.lock.patch ]; + cargoPatches = [ + ./Cargo.lock.patch + ]; cargoSha256 = "0kgjxq2319l2gh1xc0f3ir1pa6z7p62z3fccswwxrz7gbn7nc07c"; - cargoBuildFlags = [ "--features=standalone" ]; + cargoBuildFlags = ["--features=standalone"]; + + buildInputs = [ + bash + notmuch + ]; - buildInputs = [ bash notmuch ]; meta = with lib; { description = "An email tagger for notmuch"; diff --git a/packages/oc311.nix b/packages/oc311.nix index 3644768..639d882 100644 --- a/packages/oc311.nix +++ b/packages/oc311.nix @@ -1,15 +1,16 @@ -with import { }; +with import {}; stdenv.mkDerivation { name = "oc311"; version = "3.11"; src = fetchurl { - url = - "https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz"; + url = "https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz"; sha256 = "4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990da3"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' tar xvpzf $src --strip-components=1 diff --git a/packages/oc46.nix b/packages/oc46.nix index ce1d9a1..138232f 100644 --- a/packages/oc46.nix +++ b/packages/oc46.nix @@ -1,15 +1,16 @@ -with import { }; +with import {}; stdenv.mkDerivation rec { name = "oc46"; version = "4.6"; src = fetchurl { - url = - "https://github.com/openshift/okd/releases/download/4.6.0-0.okd-2021-02-14-205305/openshift-client-linux-4.6.0-0.okd-2021-02-14-205305.tar.gz"; + url = "https://github.com/openshift/okd/releases/download/4.6.0-0.okd-2021-02-14-205305/openshift-client-linux-4.6.0-0.okd-2021-02-14-205305.tar.gz"; sha256 = "741c456f1d5227eb40722b0dac328c78dceba5103fd306cf7fe57a9474eb3d35"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' tar xvpzf $src diff --git a/packages/openshift-install-4.5.nix b/packages/openshift-install-4.5.nix index 78a66a3..8822e91 100644 --- a/packages/openshift-install-4.5.nix +++ b/packages/openshift-install-4.5.nix @@ -1,16 +1,17 @@ -with import { }; +with import {}; stdenv.mkDerivation rec { name = "openshift-install-4.5"; version = "4.5.0-0"; release = "2020-10-03-012432"; src = fetchurl { - url = - "https://github.com/openshift/okd/releases/download/${version}.okd-${release}/openshift-install-linux-${version}.okd-${release}.tar.gz"; + url = "https://github.com/openshift/okd/releases/download/${version}.okd-${release}/openshift-install-linux-${version}.okd-${release}.tar.gz"; sha256 = "f497193e8918840a4fd3267839affdc91ec166c5fd2ae3fdc64f498b5fc56f55"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' tar xvpzf $src diff --git a/packages/skaffold.nix b/packages/skaffold.nix index d08f503..3527a42 100644 --- a/packages/skaffold.nix +++ b/packages/skaffold.nix @@ -1,15 +1,16 @@ -with import { }; +with import {}; stdenv.mkDerivation rec { name = "skaffold"; version = "1.17.2"; src = fetchurl { - url = - "https://github.com/GoogleContainerTools/skaffold/releases/download/v${version}/skaffold-linux-amd64"; + url = "https://github.com/GoogleContainerTools/skaffold/releases/download/v${version}/skaffold-linux-amd64"; sha256 = "55dea8be16fa3abd81820a6a03f5d708beb5e152fe71e00f00744a4dd321c55a"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; unpackPhase = '' cp $src skaffold diff --git a/packages/tuxedo-cc.nix b/packages/tuxedo-cc.nix index b0821cf..a0c88ad 100644 --- a/packages/tuxedo-cc.nix +++ b/packages/tuxedo-cc.nix @@ -1,8 +1,36 @@ -{ lib, stdenv, makeWrapper, fetchurl, rpmextract, autoPatchelfHook, alsa-lib -, cups, gdk-pixbuf, glib, gtk3, libnotify, libuuid, libX11, libXScrnSaver -, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr -, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss, pango, systemd -, libappindicator-gtk3, libdbusmenu +{ lib +, stdenv +, makeWrapper +, fetchurl +, rpmextract +, autoPatchelfHook +, alsa-lib +, cups +, gdk-pixbuf +, glib +, gtk3 +, libnotify +, libuuid +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libxcb +, libxshmfence +, mesa +, nspr +, nss +, pango +, systemd +, libappindicator-gtk3 +, libdbusmenu }: @@ -11,11 +39,11 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = - "https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_${version}.rpm"; + url = "https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_${version}.rpm"; sha256 = "0rqhfi1slnh0kkn1vnxqynxm6yb4w1mhk4vi92vj0lrxlwdxf80c"; }; + nativeBuildInputs = [ rpmextract makeWrapper @@ -84,9 +112,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + meta = with lib; { - description = - "A tool to help you control performance, energy, fan and comfort settings on TUXEDO laptops."; + description = "A tool to help you control performance, energy, fan and comfort settings on TUXEDO laptops."; homepage = "github.com/tuxedocomputers/tuxedo-control-center"; license = licenses.gpl3Only; maintainers = with maintainers; [ ]; diff --git a/packages/tuxedo-control-center/default.nix b/packages/tuxedo-control-center/default.nix index a8b858c..ea7c0e3 100644 --- a/packages/tuxedo-control-center/default.nix +++ b/packages/tuxedo-control-center/default.nix @@ -1,8 +1,9 @@ { pkgs, lib, stdenv, makeDesktopItem, desktop-file-utils, -python, + python, -makeWrapper, nodejs, electron_9, fetchFromGitHub }: + makeWrapper, nodejs, electron_9, fetchFromGitHub +}: let baseName = "tuxedo-control-center"; @@ -26,13 +27,13 @@ let # # This means we have to provide our own electron binaries when # wrapping this program. - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + ELECTRON_SKIP_BINARY_DOWNLOAD=1; # Angular prompts for analytics, which in turn fails the build. # # We can disable analytics using false or empty string # (See https://github.com/angular/angular-cli/blob/1a39c5202a6fe159f8d7db85a1c186176240e437/packages/angular/cli/models/analytics.ts#L506) - NG_CLI_ANALYTICS = "false"; + NG_CLI_ANALYTICS="false"; }; desktopItem = makeDesktopItem { @@ -43,8 +44,9 @@ let icon = "tuxedo-control-center"; categories = "System;"; }; +in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = "${nodePackages}/lib/node_modules/tuxedo-control-center/"; @@ -68,7 +70,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/common/classes/TccPaths.ts \ --replace "/etc/tcc" "/var/lib/tcc" \ --replace "/opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/service/tccd" "$out/bin/tccd" - ''; + ''; buildPhase = '' set -x diff --git a/packages/tuxedo-control-center/node-composition.nix b/packages/tuxedo-control-center/node-composition.nix index d90588f..7cd99e8 100644 --- a/packages/tuxedo-control-center/node-composition.nix +++ b/packages/tuxedo-control-center/node-composition.nix @@ -1,7 +1,8 @@ # This file has been generated by node2nix 1.9.0. Do not edit! -{ pkgs ? import { inherit system; }, system ? builtins.currentSystem -, nodejs ? pkgs."nodejs-14_x" }: +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { @@ -9,7 +10,8 @@ let inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; -in import ./node-packages.nix { +in +import ./node-packages.nix { inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/packages/tuxedo-control-center/node-env.nix b/packages/tuxedo-control-center/node-env.nix index 7643dc7..21089c4 100644 --- a/packages/tuxedo-control-center/node-env.nix +++ b/packages/tuxedo-control-center/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{ lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile }: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -9,7 +9,7 @@ let python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" { } '' + tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin cat > $out/bin/tar < $out/bin/shell < { }; +with import {}; stdenv.mkDerivation rec { name = "vaultsink"; version = "0.1.8"; src = fetchurl { - url = - "https://github.com/cookiefactory/vault-sink/releases/download/v${version}/vault-sink-linux-amd64"; + url = "https://github.com/cookiefactory/vault-sink/releases/download/v${version}/vault-sink-linux-amd64"; sha256 = "057799e7f907186993b591e3b2f743b69d7a9fed"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; installPhase = '' install -m 755 -D vault-sink-linux-amd64 $out/bin/sink diff --git a/roles/admin.nix b/roles/admin.nix index e93eb03..a96771d 100644 --- a/roles/admin.nix +++ b/roles/admin.nix @@ -1,6 +1,7 @@ -{ pkgs, options, ... }: +{ pkgs, options, ...}: -let unstable = import { }; +let + unstable = import {}; in { environment.systemPackages = with pkgs; [ cryptsetup @@ -28,8 +29,8 @@ in { ]; virtualisation.docker = { - enable = true; - storageDriver = "zfs"; + enable = true; + storageDriver = "zfs"; }; virtualisation.libvirtd.enable = true; } diff --git a/roles/base.nix b/roles/base.nix index d08c792..1cb5552 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -let unstable = import { }; +let + unstable = import {}; in { environment.systemPackages = with pkgs; [ acpi @@ -41,7 +42,9 @@ in { ]; environment = { - etc = { "starship.toml".source = ../dotfiles/starship.toml; }; + etc = { + "starship.toml".source = ../dotfiles/starship.toml; + }; variables = { BAT_THEME = "ansi"; @@ -138,9 +141,9 @@ in { services.lorri.enable = true; security.wrappers.gvfsd-nfs = { - source = "${pkgs.gnome.gvfs}/libexec/gvfsd-nfs"; - owner = "nobody"; - group = "nogroup"; + source = "${pkgs.gnome.gvfs}/libexec/gvfsd-nfs"; + owner = "nobody"; + group = "nogroup"; capabilities = "cap_net_bind_service+ep"; }; services.gvfs = { diff --git a/roles/desktop.nix b/roles/desktop.nix index e44898a..3bf6310 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -5,8 +5,6 @@ let colors = config.colors; - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; unstable = import { config.allowUnfree = true; }; in { @@ -19,22 +17,25 @@ in { i3status-rust kanshi mako - redshift-wlr slurp swayidle swaylock - wf-recorder xwayland + wf-recorder ]; - extraSessionCommands = ""; }; xdg.portal = { enable = true; gtkUsePortal = true; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + ]; }; - boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ + v4l2loopback + ]; colors = { background = "#282a36"; @@ -44,7 +45,7 @@ in { green = "#50fa7b"; yellow = "#f1fa8c"; cyan = "#8be9fd"; - magenta = "#bd93f9"; + magenta ="#bd93f9"; blue = "#61bfff"; white = "#ffffff"; }; @@ -54,37 +55,37 @@ in { "sway/config".source = ../dotfiles/sway/config; "sway/status.toml".source = ../dotfiles/sway/status.toml; "xdg/alacritty/alacritty.yml".text = '' - font: - normal: - family: CaskaydiaCove Nerd Font - size: 12 +font: + normal: + family: CaskaydiaCove Nerd Font + size: 12 - background_opacity: 0.98 - draw_bold_text_with_bright_colors: true +background_opacity: 0.98 +draw_bold_text_with_bright_colors: true - colors: - primary: - background: "${colors.background}" - foreground: "${colors.foreground}" +colors: + primary: + background: "${colors.background}" + foreground: "${colors.foreground}" - normal: - black: "${colors.black}" - red: "${colors.red}" - green: "${colors.green}" - yellow: "${colors.yellow}" - cyan: "${colors.cyan}" - magenta: "${colors.magenta}" - blue: "${colors.blue}" - white: "${colors.white}" + normal: + black: "${colors.black}" + red: "${colors.red}" + green: "${colors.green}" + yellow: "${colors.yellow}" + cyan: "${colors.cyan}" + magenta: "${colors.magenta}" + blue: "${colors.blue}" + white: "${colors.white}" - window: - dynamic_title: true +window: + dynamic_title: true - env: - TERM: xterm-256color +env: + TERM: xterm-256color - key_bindings: - - { key: Escape, mods: Control, action: ToggleViMode } +key_bindings: + - { key: Escape, mods: Control, action: ToggleViMode } ''; }; }; @@ -99,7 +100,9 @@ in { jack.enable = true; config.pipewire = { - "context.properties" = { "default.clock.rate" = 48000; }; + "context.properties" = { + "default.clock.rate" = 48000; + }; }; }; services.udev.packages = [ @@ -120,11 +123,13 @@ in { fira-code noto-fonts noto-fonts-emoji - (nerdfonts.override { fonts = [ "CascadiaCode" "Meslo" ]; }) + (nerdfonts.override { + fonts = [ "CascadiaCode" "Meslo" ]; + }) ]; nixpkgs.config.allowUnfree = true; - environment.pathsToLink = [ "/libexec" ]; + environment.pathsToLink = ["/libexec"]; environment.systemPackages = with pkgs; [ polkit_gnome @@ -146,9 +151,7 @@ in { arc-theme capitaine-cursors - dracula-theme elementary-xfce-icon-theme - glib gsettings-desktop-schemas gtk-engine-murrine gtk_engines @@ -184,29 +187,30 @@ in { xfce.thunar xfce.thunar-volman ydotool - (pkgs.writeTextFile { - name = "startsway"; - destination = "/bin/startsway"; - executable = true; - text = '' - #! ${pkgs.bash}/bin/bash + ( + pkgs.writeTextFile { + name = "startsway"; + destination = "/bin/startsway"; + executable = true; + text = '' + #! ${pkgs.bash}/bin/bash - export GTK_ICON_THEME=Dracula - export GTK_THEME=Dracula - export _JAVA_AWT_WM_NOREPARENTING=1 - export MOZ_ENABLE_WAYLAND=1 - export MOZ_USE_XINPUT2=1 - export QT_AUTO_SCREEN_SCALE_FACTOR=0 - export QT_QPA_PLATFORM=wayland-egl - export QT_WAYLAND_FORCE_DPI=96 - export SDL_VIDEODRIVER=wayland - export XDG_CURRENT_DESKTOP=sway - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - export XDG_SESSION_TYPE=wayland + export GTK_ICON_THEME=Tango + export GTK_THEME=Blackbird + export _JAVA_AWT_WM_NOREPARENTING=1 + export MOZ_ENABLE_WAYLAND=1 + export MOZ_USE_XINPUT2=1 + export QT_AUTO_SCREEN_SCALE_FACTOR=0 + export QT_QPA_PLATFORM=wayland-egl + export QT_WAYLAND_FORCE_DPI=96 + export SDL_VIDEODRIVER=wayland + export XDG_CURRENT_DESKTOP=sway + export XDG_SESSION_TYPE=wayland - ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway - ''; - }) + ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway + ''; + } + ) ]; hardware.bluetooth.enable = true; @@ -221,9 +225,14 @@ in { }; services.printing.enable = true; - services.printing.drivers = [ pkgs.gutenprint ]; + services.printing.drivers = [ + pkgs.gutenprint + ]; services.avahi.enable = true; services.avahi.nssmdns = true; - hardware.opengl = { enable = true; }; + + hardware.opengl = { + enable = true; + }; } diff --git a/roles/dev.nix b/roles/dev.nix index 13a2c69..857ffec 100644 --- a/roles/dev.nix +++ b/roles/dev.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -let unstable = import { }; +let + unstable = import {}; in { environment.systemPackages = with pkgs; [ @@ -14,8 +15,12 @@ in { #unstable.esphome nodePackages.pyright - (python39.withPackages - (python-packages: with python-packages; [ black pyyaml requests black ])) + (python39.withPackages(python-packages: with python-packages; [ + black + pyyaml + requests + black + ])) mariadb-client musl @@ -30,12 +35,6 @@ in { tig unstable.bazel - openssl - pkg-config - nasm - cmake - zlib - gcc - binutils-unwrapped + openssl pkg-config nasm cmake zlib gcc binutils-unwrapped ]; } diff --git a/roles/mail.nix b/roles/mail.nix index ba6373f..0f81277 100644 --- a/roles/mail.nix +++ b/roles/mail.nix @@ -2,7 +2,7 @@ let unstable = import { config.allowUnfree = true; }; - notcoal = pkgs.callPackage (import ../packages/notcoal) { }; + notcoal = pkgs.callPackage (import ../packages/notcoal) {}; in { environment.systemPackages = with pkgs; [ unstable.astroid diff --git a/roles/network.nix b/roles/network.nix index 4dce0d4..c56b4bf 100644 --- a/roles/network.nix +++ b/roles/network.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -let unstable = import { config.allowUnfree = true; }; +let + unstable = import { config.allowUnfree = true; }; in { networking.networkmanager.enable = true; diff --git a/roles/private.nix b/roles/private.nix index e7916dc..1d8f031 100644 --- a/roles/private.nix +++ b/roles/private.nix @@ -1,30 +1,30 @@ { config, lib, pkgs, ... }: -let unstable = import { }; +let + unstable = import {}; in { - environment.systemPackages = with pkgs; - [ - # embedded - #arduino - #avrdude - #gcc-arm-embedded - #openocd - #pkgsCross.avr.avrlibc - #pkgsCross.avr.buildPackages.binutils - #pkgsCross.avr.buildPackages.gcc8 - #pkgsCross.avr.libcCross + environment.systemPackages = with pkgs; [ + # embedded + #arduino + #avrdude + #gcc-arm-embedded + #openocd + #pkgsCross.avr.avrlibc + #pkgsCross.avr.buildPackages.binutils + #pkgsCross.avr.buildPackages.gcc8 + #pkgsCross.avr.libcCross - #cura - #candle - openscad - #kicad - #blender - #python3Packages.numpy - #python3Packages.shapely + #cura + #candle + openscad + #kicad + #blender + #python3Packages.numpy + #python3Packages.shapely - #steam - #unstable.obs-studio - ]; + #steam + #unstable.obs-studio + ]; # stm32 debugger users.extraGroups.plugdev = { }; diff --git a/roles/vpn.nix b/roles/vpn.nix index 79bcd23..d262069 100644 --- a/roles/vpn.nix +++ b/roles/vpn.nix @@ -2,5 +2,7 @@ { networking.wireguard.enable = true; - environment.systemPackages = with pkgs; [ wireguard ]; + environment.systemPackages = with pkgs; [ + wireguard + ]; } diff --git a/roles/work.nix b/roles/work.nix index 0de8954..917c586 100644 --- a/roles/work.nix +++ b/roles/work.nix @@ -2,9 +2,8 @@ let unstable = import { config.allowUnfree = true; }; - cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) { }; - nagstamon = - pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { }; + cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {}; + nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {}; in { security.pki.certificateFiles = [