diff --git a/configs/borg-exclude.nix b/configs/borg-exclude.nix new file mode 100644 index 0000000..112ae27 --- /dev/null +++ b/configs/borg-exclude.nix @@ -0,0 +1,18 @@ +{ + borg-exclude = [ + ".cache" + ".config/chromium/Default/Service Worker/CacheStorage" + ".config/discord/Cache" + ".local/share/libvirt/images" + ".local/share/Steam/config/htmlcache/Cache" + ".local/share/Steam/steamapps" + ".local/share/Trash" + "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" + "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" + "Kamera" + "Nextcloud" + "shared" + "Sync" + "Workspace" + ]; +} diff --git a/configs/common.nix b/configs/common.nix index 83f4d4e..054fc45 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -51,12 +51,8 @@ in environment.systemPackages = with pkgs; [ ack borgbackup - broot btrfs-progs - bwm_ng cargo - exa - ffmpeg gnupg gocryptfs graphviz @@ -75,11 +71,11 @@ in parallel pciutils ruby - tealdeer unixtools.xxd unzip usbutils wget + nethogs ]; documentation.enable = false; diff --git a/configs/gui.nix b/configs/gui.nix index ba98a3b..e7a9058 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -1,14 +1,13 @@ { config, pkgs, ... }: let - unstable = import { config.allowUnfree = true; }; + unstable = import { + config = { + allowUnfree = true; + chromium.commandLineArgs = "--enable-features=WebUIDarkMode,NativeNotifications,VaapiVideoDecoder --ignore-gpu-blocklist --use-gl=desktop --force-dark-mode --disk-cache-dir=/tmp/cache"; + }; + }; in { - nixpkgs.config = { - allowUnfree = true; - allowBroken = true; - chromium.commandLineArgs = "--enable-features=WebUIDarkMode,NativeNotifications,VaapiVideoDecoder --ignore-gpu-blocklist --use-gl=desktop --force-dark-mode --disk-cache-dir=/tmp/cache"; - }; - networking = { firewall.enable = false; networkmanager = { @@ -31,20 +30,16 @@ in ]; programs = { - steam.enable = true; dconf.enable = true; adb.enable = true; - # seahorse.enable = true; ssh = { startAgent = true; }; - gnupg.agent = { enable = true; pinentryFlavor = "curses"; # enableSSHSupport = true; }; - chromium = { enable = true; extensions = [ @@ -88,7 +83,7 @@ in fontDir.enable = true; fonts = with pkgs; [ - corefonts + # corefonts font-awesome google-fonts liberation_ttf diff --git a/configs/user-gui-applications.nix b/configs/user-gui-applications.nix index 6ac04d9..f52c047 100644 --- a/configs/user-gui-applications.nix +++ b/configs/user-gui-applications.nix @@ -16,6 +16,7 @@ in etcher firefox font-manager + freecad fslint gnome.cheese homebank @@ -29,6 +30,7 @@ in lxrandr mangohud meld + obs-studio pinta prusa-slicer rpi-imager @@ -41,8 +43,6 @@ in vulkan-tools wine winetricks - obs-studio - freecad ]; }; }; diff --git a/configs/user-gui.nix b/configs/user-gui.nix index d3aef34..5a95266 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -1,9 +1,7 @@ { config, pkgs, lib, ... }: -let - unstable = import { config.allowUnfree = true; }; -in -{ +let unstable = import { config.allowUnfree = true; }; +in { imports = [ ]; home-manager.users.alex = { pkgs, ... }: { @@ -51,36 +49,13 @@ in # "file:///home/alex/3D%20Print" # "file:///home/alex/Sync" # ]; - extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - # extraCss = '' - # decoration - # { - # border-radius: 0px 0px 0 0; - # border-width: 0px; - # /*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/ - # box-shadow: none; - # margin: 0px; - # } - - # decoration:backdrop - # { - # border-radius: 0px 0px 0 0; - # border-width: 0px; - # /*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/ - # box-shadow: none; - # margin: 0px; - # } - # ''; + extraConfig = { gtk-application-prefer-dark-theme = 1; }; }; iconTheme = { package = pkgs.pantheon.elementary-icon-theme; name = "elementary"; }; - theme = { - name = "Adwaita-dark"; - }; + theme = { name = "Adwaita-dark"; }; }; programs = { @@ -151,38 +126,37 @@ in git = { extraConfig = { credential.helper = "${ - pkgs.git.override { withLibsecret = true; } - }/bin/git-credential-libsecret"; + pkgs.git.override { withLibsecret = true; } + }/bin/git-credential-libsecret"; }; }; - kitty = { enable = true; extraConfig = '' - enable_audio_bell false + enable_audio_bell false - background #000000 - foreground #e9e9e9 - cursor #e9e9e9 - selection_background #424242 - color0 #000000 - color8 #000000 - color1 #d44d53 - color9 #d44d53 - color2 #b9c949 - color10 #b9c949 - color3 #e6c446 - color11 #e6c446 - color4 #79a6da - color12 #79a6da - color5 #c396d7 - color13 #c396d7 - color6 #70c0b1 - color14 #70c0b1 - color7 #fffefe - color15 #fffefe - selection_foreground #000000 + background #000000 + foreground #e9e9e9 + cursor #e9e9e9 + selection_background #424242 + color0 #000000 + color8 #000000 + color1 #d44d53 + color9 #d44d53 + color2 #b9c949 + color10 #b9c949 + color3 #e6c446 + color11 #e6c446 + color4 #79a6da + color12 #79a6da + color5 #c396d7 + color13 #c396d7 + color6 #70c0b1 + color14 #70c0b1 + color7 #fffefe + color15 #fffefe + selection_foreground #000000 ''; }; }; diff --git a/configs/user.nix b/configs/user.nix index 984b107..e237217 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -28,6 +28,10 @@ in home = { enableNixpkgsReleaseCheck = false; packages = with unstable.pkgs; [ + exa + broot + ffmpeg + tealdeer atop bpytop dfc diff --git a/machine/desktop.nix b/machine/desktop.nix index 98cd9f7..f3edcb5 100644 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -3,6 +3,7 @@ let secrets = import ../configs/secrets.nix; secrets-desktop = import ../configs/secrets-desktop.nix; + be = import ../configs/borg-exclude.nix; in { imports = @@ -141,22 +142,7 @@ in monthly = 6; }; extraPruneArgs = "--save-space --list --stats"; - exclude = map (x: paths + "/" + x) [ - ".cache" - ".config/chromium/Default/Service Worker/CacheStorage" - ".config/discord/Cache" - ".local/share/libvirt/images" - ".local/share/Steam/config/htmlcache/Cache" - ".local/share/Steam/steamapps" - ".local/share/Trash" - "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" - "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" - "Kamera" - "Nextcloud" - "shared" - "Sync" - "Workspace" - ]; + exclude = map (x: paths + "/" + x) be.borg-exclude; }; }; diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix index 07fc4f1..d16ce3e 100644 --- a/machine/thinkpad.nix +++ b/machine/thinkpad.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, lib, ... }: let nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' @@ -12,6 +8,7 @@ let exec -a "$0" "$@" ''; secrets-thinkpad = import ../configs/secrets-thinkpad.nix; + be = import ../configs/borg-exclude.nix; in { imports = @@ -176,21 +173,7 @@ in monthly = 6; }; extraPruneArgs = "--save-space --list --stats"; - exclude = map (x: paths + "/" + x) [ - ".cache" - ".config/chromium/Default/Service Worker/CacheStorage" - ".config/discord/Cache" - ".local/share/libvirt/images" - ".local/share/Steam/steamapps" - ".local/share/Trash" - "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" - "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" - "Kamera" - "Nextcloud" - "shared" - "Sync" - "Workspace" - ]; + exclude = map (x: paths + "/" + x) be.borg-exclude; }; }; diff --git a/machine/vps.nix b/machine/vps.nix index 5b1102b..bcd65a7 100644 --- a/machine/vps.nix +++ b/machine/vps.nix @@ -52,7 +52,7 @@ in internalInterfaces = [ "wg0" ]; }; firewall = { - allowedTCPPorts = [ 80 443 ]; + allowedTCPPorts = [ 80 443 22000 ]; allowedUDPPorts = [ 80 443 51820 ]; }; };