From 01708b2f1e1aeaf925be18f8ed7e2c03989dbf02 Mon Sep 17 00:00:00 2001 From: harry123 Date: Thu, 3 Jul 2025 10:02:20 +0200 Subject: [PATCH 1/4] added features/default.nix --- hosts/workstation/features/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 hosts/workstation/features/default.nix diff --git a/hosts/workstation/features/default.nix b/hosts/workstation/features/default.nix new file mode 100644 index 0000000..ca4de34 --- /dev/null +++ b/hosts/workstation/features/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./hardware + ./software + ]; +} From 4242a7ad36c55058552a47067bcb88755807e04c Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 4 Jul 2025 14:10:23 +0200 Subject: [PATCH 2/4] fix(nix-ld): removed obsolete nix-ld installation --- flake.lock | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 5 +- 2 files changed, 247 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 38ce134..efca431 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,46 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "miovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -87,7 +127,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -108,6 +148,24 @@ "type": "indirect" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -155,7 +213,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -216,14 +274,64 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "miovim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "miovim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.8", + "repo": "ixx", + "type": "github" + } + }, + "miovim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1751491874, + "narHash": "sha256-i6EJZ2aHIhtfAc66JEowrBlPknPTwt3MrRcX2RtFTGQ=", + "ref": "refs/heads/main", + "rev": "2b768f0b872f1a02c10cecd0cc1f91153449aa92", + "revCount": 13, + "type": "git", + "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" + }, + "original": { + "type": "git", + "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -301,11 +409,11 @@ "rev": "750285c41d23803be0b66571296e1f1685939511", "revCount": 8, "type": "git", - "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" + "url": "https://git.rougebordeaux.xyz/misschloe/nix-secrets.git" }, "original": { "type": "git", - "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" + "url": "https://git.rougebordeaux.xyz/misschloe/nix-secrets.git" } }, "nixlib": { @@ -360,6 +468,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgsSmall": { "locked": { "lastModified": 1748868858, @@ -393,6 +516,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748792178, + "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1748406211, + "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1748792178, "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=", @@ -408,7 +563,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1748889542, "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", @@ -424,7 +579,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -440,7 +595,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1748460289, "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", @@ -456,6 +611,51 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1748877332, + "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "miovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "owner": "NuschtOS", + "repo": "search", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "alejandra": [ @@ -463,12 +663,13 @@ ], "catppuccin": "catppuccin", "home-manager": "home-manager", + "miovim": "miovim", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", @@ -478,7 +679,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1747603214, @@ -497,7 +698,7 @@ "swww": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { @@ -529,6 +730,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -552,7 +783,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index e6db417..b8aad74 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ }; nix-secrets = { - url = "git+https://git.hypervirtual.world/harry123/nix-secrets.git"; # replace with your own repo + url = "git+https://git.rougebordeaux.xyz/misschloe/nix-secrets.git"; # replace with your own repo flake = false; }; @@ -29,7 +29,7 @@ }; */ - miovim.url = "git+https://git.rougebordeaux.xyz/harry123/miovim.git"; + miovim.url = "git+https://git.rougebordeaux.xyz/misschloe/miovim.git"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgsUnstable"; @@ -143,6 +143,7 @@ }; home-manager.extraSpecialArgs = { inherit inputs; }; } + { programs.nix-ld.enable = true; } ]; }; From c71256ea60bd4c14b675d915d6498234f5ae8140 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 4 Jul 2025 14:11:09 +0200 Subject: [PATCH 3/4] feat(home-manager): added cinny-desktop --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index b34c5a9..6bbebe2 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -66,6 +66,7 @@ wofi-emoji obsidian + cinny-desktop audacious audacious-plugins From 0b81b817b8f9ce45873d563b938fc02ad0610098 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 4 Jul 2025 14:12:14 +0200 Subject: [PATCH 4/4] feat(workstation): set zsh shell as default --- hosts/workstation/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 4ed093d..2342b3a 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -15,7 +15,7 @@ ./hardware-configuration.nix ../../shared/client/niri.nix ../../shared - ./software + ./features ]; # Bootloader. @@ -68,6 +68,7 @@ users.users.misschloe777 = { isNormalUser = true; description = "misschloe777"; + shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel"