diff --git a/configuration.nix b/configuration.nix index b02001b..849f020 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,7 @@ { - config, pkgs, sls-steam, + options, ... }: @@ -152,6 +152,7 @@ virtualisation.docker.enable = true; services.goxlr-utility.enable = true; services.lact.enable = true; + services.rsync.enable = true; programs.kdeconnect.enable = true; programs.neovim.enable = true; programs.tmux.enable = true; @@ -185,7 +186,21 @@ }; }; - programs.nix-ld.enable = true; + programs.nix-ld = { + enable = true; + libraries = options.programs.nix-ld.libraries.default ++ ( + with pkgs; [ + dbus # libdbus-1.so.3 + fontconfig # libfontconfig.so.1 + freetype # libfreetype.so.6 + glib # libglib-2.0.so.0 + libGL # libGL.so.1 + libxkbcommon # libxkbcommon.so.0 + libx11 # libX11.so.6 + wayland + ] + ); + }; services.pipewire = { enable = true; diff --git a/flake.lock b/flake.lock index 56eadb8..1a4477d 100644 --- a/flake.lock +++ b/flake.lock @@ -31,24 +31,6 @@ "type": "github" } }, - "discord-music-presence": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1783642963, - "narHash": "sha256-emlpqPMFcNI+amdIwg2a1sn5HBVlsDc18QeczCaJyI8=", - "ref": "refs/heads/master", - "rev": "ac9ddf20a3094ee9870989c3bc6016ecff2ee6c7", - "revCount": 12, - "type": "git", - "url": "https://git.pizzasucht.net/KeksNino/discord-music-presence-flake.git" - }, - "original": { - "type": "git", - "url": "https://git.pizzasucht.net/KeksNino/discord-music-presence-flake.git" - } - }, "dms": { "inputs": { "dank-qml-common": "dank-qml-common", @@ -58,11 +40,11 @@ ] }, "locked": { - "lastModified": 1784652660, - "narHash": "sha256-NHPqw6YE8T5qviGoSQNa6iofNKeVbclOk8a+ZxcUwQI=", + "lastModified": 1784816066, + "narHash": "sha256-j2jJmxgkcZemmusvQysK+bN/dDhvqYD//IPmcVsfhR0=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "53c729f6857d14144ddda8d80eb62fdefc939ee8", + "rev": "d818067bee842e432fc8ffd94bf3d0801d190c7f", "type": "github" }, "original": { @@ -169,11 +151,11 @@ ] }, "locked": { - "lastModified": 1784588016, - "narHash": "sha256-ouZe80aWEhMLVMkqICFDN+JUw+0FJtCr/bh+hHtRtMg=", + "lastModified": 1784789275, + "narHash": "sha256-cgRTWuG+u1tBPhm01JrId2k0Bni09phVJ1Q0BZlRd7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "deeb6b7eb7e0c44ae1819c051ce175bd92a85100", + "rev": "3b0e6bbd65869af1beadf5963a99befc179d209f", "type": "github" }, "original": { @@ -206,7 +188,7 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "dir": "packages/nix", @@ -243,17 +225,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" } }, @@ -274,36 +256,20 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "nixos", + "lastModified": 1784819053, + "narHash": "sha256-LjxwsNf8fZonvODqPaR6vzAN43ShWji4GaOVUMBv94w=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "d0f7f5759c3c0ef348c999a0b96eb03071a53f48", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1784657939, - "narHash": "sha256-TXrHguIvOnL98UhZd7M7W6ipN6TxmEUE66pfTR+2z3k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "234f793425454078331c82c42294a667fa35992e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -319,7 +285,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1783279667, "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", @@ -335,7 +301,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1784007870, "narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", @@ -358,11 +324,11 @@ ] }, "locked": { - "lastModified": 1784655846, - "narHash": "sha256-SQ8aNWSpkCrsuC211YLncxNr6mHPoPQRDt+5PjcjKF8=", + "lastModified": 1784819646, + "narHash": "sha256-q7etFrDCAZkGwHQDazozduWrxHc9AazJcBNVTBAM94g=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "2eaa524cfdb25c8cc468e781b467e2e9ed075e9a", + "rev": "6008a66739beb43f8d1509bda459ab5c6e59073f", "type": "github" }, "original": { @@ -373,12 +339,11 @@ }, "root": { "inputs": { - "discord-music-presence": "discord-music-presence", "dms": "dms", "gsr-ui": "gsr-ui", "home-manager": "home-manager", "millennium": "millennium", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", "sls-steam": "sls-steam", "xremap-flake": "xremap-flake", @@ -414,11 +379,11 @@ ] }, "locked": { - "lastModified": 1784138783, - "narHash": "sha256-sQDwDAIZDUILLle+mcD8pux/kgiv2Ozeh7Y9F6GTkrQ=", + "lastModified": 1784795486, + "narHash": "sha256-0tdz12pbTWs+V7eIMpv6foT/qN4B1tuxs5LLc8b3A5M=", "owner": "AceSLS", "repo": "SLSsteam", - "rev": "9cc2ff2e57ae71620614c580d54195bb1d4b6d43", + "rev": "6725ff148090976a32cb4b717c1acfe48f95b48f", "type": "github" }, "original": { @@ -478,7 +443,7 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "xremap": "xremap" }, "locked": { @@ -498,15 +463,15 @@ "yazi": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1784595560, - "narHash": "sha256-fIfothdeD9EF+0+N2//4HedPMRCMnXDs5evz2qYgUYY=", + "lastModified": 1784743179, + "narHash": "sha256-zEFky4d+WKVfbWVzcGkECsQgwW0XZWilGA5VQpgtFek=", "owner": "sxyazi", "repo": "yazi", - "rev": "6aa75594dbea287001c823853235e6a4f9d45997", + "rev": "58f1013348c969538352e3105f58e8d8e870a092", "type": "github" }, "original": { @@ -518,7 +483,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1784586513, diff --git a/flake.nix b/flake.nix index 87ff6ec..5f37228 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ outputs = { - self, nixpkgs, home-manager, zen-browser, diff --git a/home-manager/home.nix b/home-manager/home.nix index 30b350d..97b2adc 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -122,29 +122,33 @@ set -g fish_key_bindings fish_hybrid_key_bindings set fish_greeting ''; - }; - - programs.fish.shellAliases = { - ls = "eza -al --no-time --no-user --no-permissions --no-filesize"; - ll = "eza -la"; - cat = "bat"; - cd = "z"; - cp = "cp -v"; - ff = "fastfetch"; - grep = "grep -i"; - hyprland = "start-hyprland"; - mv = "mv -v"; - n = "nvim"; - py = "uv run"; - r = "rsync -avh --info=progress2"; - rm = "gomi"; - ssh = "kitty +kitten ssh"; - nd = "nix develop"; + shellAliases = { + ls = "eza -al --no-time --no-user --no-permissions --no-filesize"; + ll = "eza -la"; + cat = "bat"; + cd = "z"; + cp = "cp -v"; + ff = "fastfetch"; + grep = "grep -i"; + hyprland = "start-hyprland"; + mv = "mv -v"; + n = "nvim"; + py = "uv run"; + r = "rsync -avh --info=progress2"; + rm = "gomi"; + ssh = "kitty +kitten ssh"; + nd = "nix develop"; + }; }; programs.zoxide.enable = true; programs.zoxide.enableFishIntegration = true; + home.file.".local/share/Steam/steam.cfg".text = '' + BootStrapperInhibitAll=enable + BootStrapperForceSelfUpdate=disable + ''; + gtk = { enable = true; # theme = { diff --git a/packages.nix b/packages.nix index 0f1c8af..f979a79 100644 --- a/packages.nix +++ b/packages.nix @@ -33,7 +33,7 @@ spek ffmpeg vlc - wine + # wine ripgrep nemo unrar @@ -54,6 +54,7 @@ ayugram-desktop playerctl musicpresence + nixd ]; fonts.packages = with pkgs; [