diff --git a/flake.lock b/flake.lock index 3414bd9..7a2a6f7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1718371084, - "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", + "lastModified": 1720546205, + "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", "owner": "ryantm", "repo": "agenix", - "rev": "3a56735779db467538fb2e577eda28a9daacaca6", + "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1719640067, - "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", + "lastModified": 1721612107, + "narHash": "sha256-1F2N90WqHV14oIn5RpDfzINj4zMi5gBQOt1BAc34gGM=", "owner": "nix-community", "repo": "disko", - "rev": "423b86a7f756421325e71663ada79a199bf13408", + "rev": "2f5df5dcceb8473dd5715c4ae92f9b0d5f87fff9", "type": "github" }, "original": { @@ -262,22 +262,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -301,11 +285,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -386,7 +370,10 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": [ + "nixvim", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -398,11 +385,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -478,11 +465,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -499,11 +486,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -521,11 +508,11 @@ ] }, "locked": { - "lastModified": 1719588253, - "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -582,11 +569,11 @@ ] }, "locked": { - "lastModified": 1719128254, - "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "50581970f37f06a4719001735828519925ef8310", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -604,11 +591,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719624901, - "narHash": "sha256-XBFFLLBpG7+63g3BzR5dMiDpXPQ81bhe6wNAki4jmkM=", + "lastModified": 1721160462, + "narHash": "sha256-/VxDWswjySr3CUuMRP4OBBP3sFSps7r1Bh/AJkZSdVk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "ecec4c9e94f4a7d0e7945d471c4792dc370c3d45", + "rev": "b2d62f3b793495c1156cba6a99512cd95ac2c439", "type": "github" }, "original": { @@ -619,11 +606,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719647737, - "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", + "lastModified": 1721413321, + "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "231274268ff2250d4730e274b808f66ef91b6381", + "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", "type": "github" }, "original": { @@ -642,11 +629,11 @@ ] }, "locked": { - "lastModified": 1719220171, - "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=", + "lastModified": 1721650907, + "narHash": "sha256-2VX/zPeLhGTsHpToFH1gfI+oGNS6m7ZUWWaqwmw3HVY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "269411cfed6aab694e46f719277c972de96177bb", + "rev": "6686cbe947cb8b135e229ad2a3447b88d1cf6da9", "type": "github" }, "original": { @@ -688,11 +675,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719426051, - "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -704,11 +691,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -719,11 +706,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1721548954, + "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", "type": "github" }, "original": { @@ -763,11 +750,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719666075, - "narHash": "sha256-65P3TcZi0s+dOc9uG6/+3bO3/IhG71RDjbkF44HjIfs=", + "lastModified": 1721651056, + "narHash": "sha256-GOm1qWrT0MurD/84RzWj/E6GPmzPT5nH/hrSYohtlxs=", "owner": "nix-community", "repo": "nixvim", - "rev": "049bbc168fe449cca37ddf3b0b56c4f93408052b", + "rev": "6dc0bda459bcfb2a38cf7b6ed1d6a5d6a8105f00", "type": "github" }, "original": { @@ -778,11 +765,11 @@ }, "nur": { "locked": { - "lastModified": 1719675884, - "narHash": "sha256-ID92f3bDV2IfPvXNxGf5hDMHkcyYVXYXRBP1GSxUw/I=", + "lastModified": 1721659002, + "narHash": "sha256-xTW+3zEOLtfBblZPSXsSSfMLnk6DgPjVCO+ZEGkGn84=", "owner": "nix-community", "repo": "NUR", - "rev": "b4142be78e0e998796d0b32101994b84c7bbae68", + "rev": "1cbdff10e618eaa7c0f9cfbde10adc648d45d536", "type": "github" }, "original": { @@ -818,17 +805,17 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1721573849, + "narHash": "sha256-pHfzFzjADtCqMswGwrfC5klBWJZ6h94bxVrVObJLrEM=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "0ef70039a6435446472182c8f8106947abfc523d", "type": "github" }, "original": { @@ -905,11 +892,11 @@ ] }, "locked": { - "lastModified": 1719243788, - "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { diff --git a/home-manager/zsh/default.nix b/home-manager/zsh/default.nix index cc2d192..9b2575a 100644 --- a/home-manager/zsh/default.nix +++ b/home-manager/zsh/default.nix @@ -21,7 +21,7 @@ updateOffline = "sudo nixos-rebuild switch --option substitute false"; goto = "cd $(find ~/projects -maxdepth 2 -type d | ${pkgs.fzf}/bin/fzf)"; dev = "nix-shell --run zsh"; - rm = "trashy put"; + rm = "trash put"; cat = "bat -P --style plain"; cdf = "cd $(fd --type d --exclude node_modules --exclude bin --exclude target --exclude .cache . | fzf)"; }; diff --git a/modules/graphical/audio.nix b/modules/graphical/audio.nix index f53686f..e5eeb77 100644 --- a/modules/graphical/audio.nix +++ b/modules/graphical/audio.nix @@ -10,7 +10,6 @@ in config = mkIf cfg.enable { # Enable sound with pipewire. - sound.enable = false; hardware.pulseaudio.enable = false; security.rtkit.enable = true; diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix index 172b01f..7e6c2a7 100644 --- a/modules/graphical/i3.nix +++ b/modules/graphical/i3.nix @@ -70,7 +70,6 @@ in { dex # starts applications according to .desktop files xss-lock # locks the screen when the system is idle pavucontrol - libsForQt5.dolphin playerctl brightnessctl i3blocks diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index 05d6689..e57c07c 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -50,18 +50,19 @@ in { }; #services.xserver.wacom.enable = true; - services.tumbler.enable = true; # for thumbnails - services.gvfs = { - enable = true; # for file manager, trash support, etc. - package = pkgs.gvfs; - }; + programs.file-roller.enable = true; + programs.thunar.enable = true; + programs.thunar.plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; + services.gvfs.enable = true; # for file manager, trash support, etc. # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ keepassxc - xfce.thunar # file manager discord vesktop gvfs @@ -82,7 +83,7 @@ in { pinta # paint #qalculate-qt # calculator TODO build broken #libsForQt5.kcalc - syncthingtray + #syncthingtray #doesnt work with socket yet v4l-utils logseq # notes xarchiver # archive tool diff --git a/modules/misc/cli-tools.nix b/modules/misc/cli-tools.nix index ee64810..77366c8 100644 --- a/modules/misc/cli-tools.nix +++ b/modules/misc/cli-tools.nix @@ -56,6 +56,7 @@ in imagemagick #convert images tree kop-newproject # creates a shell.nix and .envrc + nix-tree # show nix derivations ]; }; } diff --git a/overlays.nix b/overlays.nix index 549ae99..8362db5 100644 --- a/overlays.nix +++ b/overlays.nix @@ -19,19 +19,6 @@ #fastfetch = prev.fastfetch.overrideAttrs (oldAttrs: { # cmakeFlags = [ (prev.lib.cmakeBool "ENABLE_IMAGEMAGICK6" true) (prev.lib.cmakeBool "ENABLE_IMAGEMAGICK7" true) (prev.lib.cmakeBool "ENABLE_CHAFA" true) ]; #}); - trashy = prev.trashy.overrideAttrs rec { - version = "unstable-2.0.0"; - src = prev.fetchFromGitHub { - owner = "oberblastmeister"; - repo = "trashy"; - rev = "7c48827e55bca5a3188d3de44afda3028837b34b"; - sha256 = "1pxmeXUkgAITouO0mdW6DgZR6+ai2dax2S4hV9jcJLM="; - }; - cargoDeps = prev.rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-/q/ZCpKkwhnPh3MMVNYZw6XvjyQpoZDBXCPagliGr1M="; - }; - }; # example = prev.example.overrideAttrs (oldAttrs: rec { # ... # });