4Lost/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update and fix impure

Browse Source
This commit is contained in:
4Lost
2025-02-16 08:23:36 +01:00
parent 7c969adbf5
commit 222934016f
7 changed files with 158 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
flake.lock generated
View File

@@ -3,11 +3,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732722421, "lastModified": 1733328505,
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1738453229,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -62,11 +62,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1736143030,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -74,6 +74,27 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@@ -117,18 +138,14 @@
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"neovim-nightly-overlay",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1732021966, "lastModified": 1737465171,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -139,7 +156,7 @@
}, },
"git-ignore-nix": { "git-ignore-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1709087332,
@@ -158,7 +175,7 @@
}, },
"git-ignore-nix_2": { "git-ignore-nix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1709087332,
@@ -206,11 +223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730903510, "lastModified": 1738237977,
"narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "narHash": "sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV+sFnNB/38Tb9RL4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "rev": "6d1b6d5d59758b4f5f05745f774fc13cdc59da43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -226,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1739571712,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -248,14 +265,15 @@
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1732775233, "lastModified": 1739578374,
"narHash": "sha256-G9W0wi0MD9JvG3bmvWQSMVR684drSlWGY1auhCNxO8c=", "narHash": "sha256-ipXtyL3JbBsJA+Axr5FGVcP28vfrIyOisVCSyjud4vA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "b09ab000f85a830fac6f599947dfa268227aab31", "rev": "431a128acf3048670ff80048dde2a172045a062f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -267,11 +285,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732733768, "lastModified": 1739576536,
"narHash": "sha256-y3LmGebXuQhLz9w1IzkDU8b464WvMvPCbIImpVvxmcI=", "narHash": "sha256-4gqndlNmaA0h2gm/y7rW/Jg3CSpyAgGm3O3ox8dWLxE=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "76dcc7029b200e1d85024d7ba4a34c602e730dbe", "rev": "10a3a854736895783aac9fd5dd86156f7ae25df1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -282,11 +300,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1739446958,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -298,16 +316,18 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1666603677, "lastModified": 1739446958,
"narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
@@ -325,10 +345,24 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1666603677,
"narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source", "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@@ -337,12 +371,17 @@
} }
}, },
"nur": { "nur": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix_2"
},
"locked": { "locked": {
"lastModified": 1732784817, "lastModified": 1739648866,
"narHash": "sha256-I37vvlS+qk4TMzMouw9kJCilahl8+fOjnCWsBJmPv+U=", "narHash": "sha256-H5YB2CLR6uLXLDXpUUE6NWYc2mHrzZ0Itu8N3Fo2CZE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "7c412613e5ed3d49f2e198c0b0187add6b897b3d", "rev": "a3eb209a608558fd41e4dfeba0a1c6f9339908d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -427,13 +466,55 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738953846,
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1739446958,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -452,11 +533,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1732723146, "lastModified": 1738500836,
"narHash": "sha256-Jd/+JMMn1lgm1Oe78du6DVkFWGCWvbNuSXsIKzcCeME=", "narHash": "sha256-/aVKAtef7j93Uk0+7n3hlu9ZmKFf0jidJ5t45pGN38g=",
"owner": "danyspin97", "owner": "danyspin97",
"repo": "wpaperd", "repo": "wpaperd",
"rev": "459c4e9c8bdd0f8b0572751efc96b59a2dd4cc78", "rev": "acc5652f644810c51394baf4f75cc2d20c0f334c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -469,15 +550,15 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"git-ignore-nix": "git-ignore-nix_2", "git-ignore-nix": "git-ignore-nix_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"unstable": "unstable" "unstable": "unstable"
}, },
"locked": { "locked": {
"lastModified": 1731735867, "lastModified": 1737931897,
"narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=", "narHash": "sha256-FZqdnMRPuQON69kJ3Yj56+tnarlO3DlRyvzODVxfoco=",
"owner": "xmonad", "owner": "xmonad",
"repo": "xmonad", "repo": "xmonad",
"rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1", "rev": "39ae48970cac7cc75431ad39b003636541a1fae4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -496,11 +577,11 @@
"xmonad": "xmonad" "xmonad": "xmonad"
}, },
"locked": { "locked": {
"lastModified": 1732441885, "lastModified": 1739182012,
"narHash": "sha256-SKl/9dmpWpAs30YgQfB7jpdJuUYcPd50SqqUGGaswr0=", "narHash": "sha256-+kxtIMwZjIWjhOm4Ty4Bgbl4Yxzi37JaxPVgm5FXL78=",
"owner": "xmonad", "owner": "xmonad",
"repo": "xmonad-contrib", "repo": "xmonad-contrib",
"rev": "0dc879698def6325352886c3923299cfc951ca8e", "rev": "5119626269eeda899584545b72883e2b59b62b9a",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@@ -36,7 +36,7 @@
modules = [ modules = [
./machines/configuration-laptop.nix ./machines/configuration-laptop.nix
./home/services/pipewire.nix ./home/services/pipewire.nix
nur.nixosModules.nur nur.modules.nixos.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
@@ -52,7 +52,7 @@
}) })
inputs.neovim-nightly-overlay.overlays.default inputs.neovim-nightly-overlay.overlays.default
inputs.wpaperd.overlays.default inputs.wpaperd.overlays.default
inputs.nur.overlay inputs.nur.overlays.default
(import overlays/minlog.nix) (import overlays/minlog.nix)
(import overlays/obsidian.nix) (import overlays/obsidian.nix)
]; ];
@@ -64,7 +64,7 @@
modules = [ modules = [
./machines/configuration-desktop.nix ./machines/configuration-desktop.nix
./home/services/pipewire.nix ./home/services/pipewire.nix
nur.nixosModules.nur nur.modules.nixos.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
@@ -80,7 +80,7 @@
}) })
inputs.neovim-nightly-overlay.overlays.default inputs.neovim-nightly-overlay.overlays.default
inputs.wpaperd.overlays.default inputs.wpaperd.overlays.default
inputs.nur.overlay inputs.nur.overlays.default
(import overlays/minlog.nix) (import overlays/minlog.nix)
(import overlays/obsidian.nix) (import overlays/obsidian.nix)
]; ];

8
home/programs/neovim/default.nix
View File

@@ -6,7 +6,11 @@ let
in { in {
home.sessionVariables = { EDITOR = "nvim"; }; home.sessionVariables = { EDITOR = "nvim"; };
home.packages = with pkgs; [ nerdfonts texliveFull clang-tools ]; home.packages = with pkgs; [
nerd-fonts.jetbrains-mono
texliveFull
clang-tools
];
programs.neovim = { programs.neovim = {
enable = true; enable = true;
@@ -88,7 +92,7 @@ in {
neovim-remote neovim-remote
# Nix # Nix
nixd nixd
nixfmt nixfmt-classic
# Rust # Rust
rust-analyzer rust-analyzer
# Bash # Bash

2
home/programs/neovim/lua/plugins/conform-nvim.lua
View File

@@ -29,7 +29,7 @@ return {
markdown = { "prettierd" }, markdown = { "prettierd" },
json = { "prettierd" }, json = { "prettierd" },
yaml = { "prettierd" }, yaml = { "prettierd" },
nix = { "nixfmt" }, nix = { "nixfmt-classic" },
tex = { "latexindent" }, tex = { "latexindent" },
c = { "clang_format" }, c = { "clang_format" },
cpp = { "clang_format" }, cpp = { "clang_format" },

8
home/programs/rofi/default.nix
View File

@@ -1,7 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ oranchelo-icon-theme nerdfonts xclip ]; home.packages = with pkgs; [
#oranchelo-icon-theme
nerd-fonts.jetbrains-mono
xclip
];
xsession.initExtra = "setxkbmap de"; # rofi pass needs this to be set xsession.initExtra = "setxkbmap de"; # rofi pass needs this to be set
@@ -11,7 +15,7 @@
theme = ./theme.rafi; theme = ./theme.rafi;
extraConfig = { extraConfig = {
mode = "run,drun,window,ssh,network"; mode = "run,drun,window,ssh,network";
icon-theme = "Oranchelo"; #icon-theme = "Oranchelo";
show-icons = true; show-icons = true;
drun-display-format = "{icon} {name}"; drun-display-format = "{icon} {name}";
location = 0; location = 0;

2
home/programs/xmonad/src/xmobar/default.nix
View File

@@ -3,7 +3,7 @@ with pkgs;
haskellPackages.mkDerivation { haskellPackages.mkDerivation {
pname = "xmobar"; pname = "xmobar";
version = "0.1.0.0"; version = "0.1.0.0";
src = /etc/nixos/home/programs/xmonad/src/xmobar/.; src = ./.;
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
executableHaskellDepends = with haskellPackages; [ base xmobar ]; executableHaskellDepends = with haskellPackages; [ base xmobar ];

2
overlays/obsidian.nix
View File

@@ -3,7 +3,7 @@ final: prev: {
src = prev.fetchurl { src = prev.fetchurl {
url = old.src.url; url = old.src.url;
hash = "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po="; hash = "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE=";
}; };
}); });
} }