From 254331bebe685a09ac83d32bd085a0cd259de23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Sun, 24 Mar 2024 22:03:41 +0100 Subject: [PATCH] feat: stuff --- flake.lock | 221 ++++++++++++++++++++++++------- home/packages/default.nix | 5 +- home/programs/affinity-photo.nix | 32 ----- home/programs/bitwarden.nix | 8 -- home/programs/default.nix | 17 ++- home/programs/nixvim/default.nix | 56 ++++---- home/services/default.nix | 2 +- hosts/MONSTER/nvidia.nix | 2 +- 8 files changed, 218 insertions(+), 125 deletions(-) delete mode 100644 home/programs/affinity-photo.nix delete mode 100644 home/programs/bitwarden.nix diff --git a/flake.lock b/flake.lock index d2fd340..2968078 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709223815, - "narHash": "sha256-rJVzCcmaz8nBBLaUR2fzjq5fWwgey5BDT0Sb06Ltgi8=", + "lastModified": 1710947530, + "narHash": "sha256-tbUlS7ixL0JCNY7f9ilMwemVMabbveCXb3aIdWWE1Zs=", "owner": "Aylur", "repo": "ags", - "rev": "83656429d02028a57273e257816ebb286d7a648d", + "rev": "915c3dfcd403e5d3155a410bcda5b93e15a44161", "type": "github" }, "original": { @@ -39,6 +39,28 @@ "type": "github" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "owner": "numtide", + "repo": "devshell", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -98,11 +120,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -113,7 +135,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -129,6 +151,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -138,11 +178,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -158,11 +198,11 @@ ] }, "locked": { - "lastModified": 1709204054, - "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f3367769a93b226c467551315e9e270c3f78b15", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -179,11 +219,11 @@ ] }, "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -192,21 +232,48 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711035742, + "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs_2", - "systems": "systems", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709243510, - "narHash": "sha256-e47KWaUGQc+JLUABYdG0eCeqY1fFf1xGvakpKcdOP9c=", + "lastModified": 1711309196, + "narHash": "sha256-KV0rVdp7TwDS/IXX3Itii73+WKiJ2f8hVHV4OWHiIZU=", "owner": "hyprwm", "repo": "hyprland", - "rev": "f590505daf90dfb4059289a906863b59663e70a6", + "rev": "294ff8609f80b8e9d16233de94e49f992d5de33a", "type": "github" }, "original": { @@ -241,6 +308,29 @@ } }, "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -252,11 +342,11 @@ ] }, "locked": { - "lastModified": 1708787654, - "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", + "lastModified": 1710960526, + "narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0fce791ba2334aca183f2ed42399518947550d0d", + "rev": "a2f39421144d42541c057be235154ce21b76c0f6", "type": "github" }, "original": { @@ -273,11 +363,11 @@ ] }, "locked": { - "lastModified": 1709001452, - "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c06334f0843c7300d1678726bb607ce526f6b36", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -304,11 +394,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1711001935, + "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "20f77aa09916374aa3141cbc605c955626762c9a", "type": "github" }, "original": { @@ -320,11 +410,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -336,6 +426,7 @@ }, "nixvim": { "inputs": { + "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", @@ -346,11 +437,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709277403, - "narHash": "sha256-xEpCiFOeu9Th0NUPUbsBncDKnXQd+A4XZd6r/FJ6dQw=", + "lastModified": 1711284540, + "narHash": "sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA=", "owner": "nix-community", "repo": "nixvim", - "rev": "8c0bdb17e980b2ca64860e309ce601dd92ce0c51", + "rev": "e7a3461fefd983ae3443e9aa849e9d1566ab47e4", "type": "github" }, "original": { @@ -361,11 +452,11 @@ }, "nur": { "locked": { - "lastModified": 1709278039, - "narHash": "sha256-+NW+df4TSznF0QFumSH0be17W1e0ONWILqw/IYKpFDs=", + "lastModified": 1711310052, + "narHash": "sha256-x2uMh3JFblIZ+uLsSQY1Px1/II4sKk07qvvxbOQ7V+k=", "owner": "nix-community", "repo": "NUR", - "rev": "975323e2a56dde3ed8879469091a830ca8b2f3cd", + "rev": "1393242e65123b8752087e0f997626071e1f8656", "type": "github" }, "original": { @@ -377,7 +468,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -389,11 +480,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -429,6 +520,36 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -447,18 +568,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -482,11 +603,11 @@ ] }, "locked": { - "lastModified": 1708696469, - "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/home/packages/default.nix b/home/packages/default.nix index 8287a51..4815686 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -20,7 +20,7 @@ # youtube-music.override {electron = pkgs.electron_28;}) mpv makemkv - handbrake + # handbrake metadata-cleaner bitwarden @@ -35,7 +35,7 @@ apostrophe # markdown editor # creative - gimp-with-plugins + gimp inkscape-with-extensions scribus audacity @@ -71,7 +71,6 @@ gh git-filter-repo neofetch - pinentry-gnome ranger filezilla lazydocker diff --git a/home/programs/affinity-photo.nix b/home/programs/affinity-photo.nix deleted file mode 100644 index ec12a85..0000000 --- a/home/programs/affinity-photo.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - stdenv, - fetchurl, - pkgs, - p7zip, - wineWowPackages, - winetricks, -}: -stdenv.mkDerivation rec { - name = "affinity-photo"; - version = "1.10.6"; - - src = ./affinity-photo-${version}.exe; - dontUnpack = true; - - buildInputs = [wineWowPackages.stable winetricks]; - - installPhase = '' - mkdir -p $out/share/$name - cd $out/share/$name - ${p7zip}/bin/7z x $src - - mkdir -p $out/bin - cd $out/bin - echo "#!${stdenv.shell}" >> $name - echo "export WINEARCH=win64" >> $name - echo "export WINEPREFIX=~/.config/$name" >> $name - echo "${winetricks}/bin/winetricks -q corefonts dotnet472" >> $name - echo "${wineWowPackages.stable}/bin/wine $out/share/$name/App.exe" >> $name - chmod +x $name - ''; -} diff --git a/home/programs/bitwarden.nix b/home/programs/bitwarden.nix deleted file mode 100644 index ad9ffae..0000000 --- a/home/programs/bitwarden.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - enable = true; - settings = { - base_url = "pw.theaninova.de"; - email = "pw@theaninova.de"; - pinentry = "gnome3"; - }; -} diff --git a/home/programs/default.nix b/home/programs/default.nix index 830b562..4cfc7dd 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,7 +1,18 @@ -{pkgs, config, ...}: { +{ + pkgs, + config, + ... +}: { programs = { home-manager.enable = true; - rbw = import ./bitwarden.nix; + rbw = { + enable = true; + settings = { + base_url = "pw.theaninova.de"; + email = "pw@theaninova.de"; + pinentry = pkgs.pinentry-gnome3; + }; + }; git = import ./git.nix; lazygit.enable = true; nixvim = import ./nixvim {inherit pkgs;}; @@ -16,7 +27,7 @@ zsh = { enable = true; enableCompletion = true; - enableAutosuggestions = true; + autosuggestion.enable = true; syntaxHighlighting.enable = true; defaultKeymap = "viins"; }; diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix index 203f060..fd4337f 100644 --- a/home/programs/nixvim/default.nix +++ b/home/programs/nixvim/default.nix @@ -229,7 +229,7 @@ in { trouble = { enable = true; - useDiagnosticSigns = true; + settings.use_diagnostic_signs = true; }; treesitter = { @@ -377,34 +377,36 @@ in { Copilot = ""; }; }; - nvim-cmp = { + cmp = { enable = true; - mapping = { - "" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})"; - "" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})"; - "" = "cmp.mapping.confirm({select = true})"; - "" = "cmp.mapping.complete()"; + settings = { + mapping = { + "" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})"; + "" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})"; + "" = "cmp.mapping.confirm({select = true})"; + "" = "cmp.mapping.complete()"; + }; + sources = [ + {name = "copilot";} + {name = "path";} + {name = "luasnip";} + { + name = "npm"; + keywordLength = 4; + priority = 10; + } + {name = "nvim_lsp";} + {name = "nvim_lsp_signature_help";} + {name = "nvim_lsp_document_symbol";} + ]; + formatting.fields = ["abbr" "kind"]; + snippet.expand = "luasnip"; + window = { + completion.border = "rounded"; + documentation.border = "rounded"; + }; + experimental.ghost_text = true; }; - sources = [ - {name = "copilot";} - {name = "path";} - {name = "luasnip";} - { - name = "npm"; - keywordLength = 4; - priority = 10; - } - {name = "nvim_lsp";} - {name = "nvim_lsp_signature_help";} - {name = "nvim_lsp_document_symbol";} - ]; - formatting.fields = ["abbr" "kind"]; - snippet.expand = "luasnip"; - window = { - completion.border = "rounded"; - documentation.border = "rounded"; - }; - experimental.ghost_text = true; }; which-key = { diff --git a/home/services/default.nix b/home/services/default.nix index 0875525..aca1bc4 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -7,7 +7,7 @@ gpg-agent = { enable = true; enableSshSupport = true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; # fix pinentry on non-gnome with this in # the system config: services.dbus.packages = with pkgs; [ gcr ]; diff --git a/hosts/MONSTER/nvidia.nix b/hosts/MONSTER/nvidia.nix index b379fed..a0f5a2a 100644 --- a/hosts/MONSTER/nvidia.nix +++ b/hosts/MONSTER/nvidia.nix @@ -36,7 +36,7 @@ }; systemPackages = with pkgs; [ glxinfo - nvtop-nvidia + nvtopPackages.nvidia libva-utils vulkan-tools ];