diff --git a/configs/borg-exclude.nix b/configs/borg-exclude.nix index 112ae27..9c5a1a7 100644 --- a/configs/borg-exclude.nix +++ b/configs/borg-exclude.nix @@ -9,10 +9,6 @@ ".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/bspwm.nix b/configs/bspwm.nix index 8963832..f4d5d19 100644 --- a/configs/bspwm.nix +++ b/configs/bspwm.nix @@ -7,12 +7,13 @@ in services = { blueman.enable = true; + accounts-daemon.enable = pkgs.lib.mkForce false; xserver = { enable = true; displayManager = { lightdm = { enable = true; - background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath; + background = ../wallpaper.jpg; greeters.gtk.theme = { name = "Adwaita-dark"; }; diff --git a/configs/gui.nix b/configs/gui.nix index 8c6c867..4f83721 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -8,6 +8,8 @@ let }; in { + nixpkgs.config.allowUnfree = true; + networking = { firewall.enable = false; networkmanager = { @@ -41,7 +43,7 @@ in chromium = { enable = true; extensions = [ - "cbnipbdpgcncaghphljjicfgmkonflee" # Axel Springer Blocker + # "cbnipbdpgcncaghphljjicfgmkonflee" # Axel Springer Blocker "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin "mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock for YouTube "oboonakemofpalcgghocfoadofidjkkk" # KeePassXC-Browser @@ -83,7 +85,7 @@ in fonts = with pkgs; [ # (nerdfonts.override { fonts = [ "Liberation" ]; }) nerdfonts - # corefonts + corefonts google-fonts liberation_ttf noto-fonts diff --git a/configs/user-gui.nix b/configs/user-gui.nix index f3b8d7d..8eefd20 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -30,6 +30,8 @@ in ponymix #rofi-default mullvad-vpn dracula-theme + deadbeef + grsync ]; }; diff --git a/configs/user.nix b/configs/user.nix index b3b0592..6eb8d2f 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -58,6 +58,10 @@ in executable = true; source = ../home/bin/git-redate; }; + ".bin/backup-to-stick" = { + executable = true; + source = ../home/bin/backup-to-stick; + }; }; }; diff --git a/home/bin/backup-to-stick b/home/bin/backup-to-stick new file mode 100755 index 0000000..0234191 --- /dev/null +++ b/home/bin/backup-to-stick @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +rsync -rtpogv --progress --delete -s /home/alex/Workspace /run/media/alex/USB-Stick/ +rsync -rtpogv --progress --delete -s /home/alex/Sync /run/media/alex/USB-Stick/ +rsync -rtpogv --progress --delete -s /home/alex/Kamera /run/media/alex/USB-Stick/ diff --git a/machine/desktop.nix b/machine/desktop.nix index f76675b..48d7c7f 100644 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -20,7 +20,6 @@ in #../configs/pantheon.nix ]; - # Use the systemd-boot EFI boot loader. fileSystems."/".options = [ "noatime" "discard" ]; fileSystems."/boot".options = [ "noatime" "discard" ]; fileSystems."/mnt/second" = { @@ -37,6 +36,7 @@ in device = "nodev"; efiSupport = true; gfxmodeEfi = "1024x768"; + configurationLimit = 5; }; efi.canTouchEfiVariables = true; diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix index 4f8938a..39b291a 100644 --- a/machine/thinkpad.nix +++ b/machine/thinkpad.nix @@ -11,9 +11,6 @@ let be = import ../configs/borg-exclude.nix; in { - nixpkgs.config = { - allowUnfree = true; - }; imports = [ @@ -45,7 +42,7 @@ in efiSysMountPoint = "/boot/efi"; }; }; - kernelPackages = pkgs.linuxPackages_5_14; + kernelPackages = pkgs.linuxPackages_lqx; plymouth.enable = true; initrd = { luks.devices."root" = { @@ -172,6 +169,7 @@ in }; power-profiles-daemon.enable = false; auto-cpufreq.enable = true; + tlp.enable = false; # tlp = { # enable = true; # settings = { @@ -201,12 +199,16 @@ in }; }; - home-manager.users.alex.services.barrier.client = { - enable = true; - enableCrypto = false; - name = "thinkpad"; - server = "192.168.0.150:24800"; - }; + # home-manager.users.alex.services.barrier.client = { + # enable = true; + # enableCrypto = false; + # name = "thinkpad"; + # server = "192.168.0.150:24800"; + # }; + + systemd.extraConfig = '' + DefaultTimeoutStopSec=10s + ''; environment.systemPackages = with pkgs; [ nvidia-offload diff --git a/wallpaper.jpg b/wallpaper.jpg new file mode 100644 index 0000000..ff74bc4 Binary files /dev/null and b/wallpaper.jpg differ