This commit is contained in:
41666 2024-01-25 20:51:11 -05:00
parent 7dc9d5ea99
commit fcb518e619
6 changed files with 86 additions and 122 deletions

173
flake.lock generated
View file

@ -25,16 +25,17 @@
"crane": "crane", "crane": "crane",
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-filter": "nix-filter",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1705514181, "lastModified": 1706138640,
"narHash": "sha256-Y9qOM42lqfvVdg9VZ7lH6VXRcuAkH0T/FbgX+hW/1IQ=", "narHash": "sha256-HjPCE+b/RpBhKvfeDnWfvgTW74SIrj9iKdMEIKDS1Fo=",
"owner": "famedly", "owner": "famedly",
"repo": "conduit", "repo": "conduit",
"rev": "247599510290163181b8884fc2418d9e86e584c8", "rev": "ca198c51fad2cccf572a1aae380dfd0e591b9937",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -45,23 +46,17 @@
}, },
"crane": { "crane": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": [
"conduit",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"conduit", "conduit",
"nixpkgs" "nixpkgs"
], ]
"rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1688772518, "lastModified": 1705597458,
"narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", "narHash": "sha256-vJ8Ib9ruxbaBxGEcA0d7dHqxpc6Z+SGR2XIxVeSMuLM=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", "rev": "742170d82cd65c925dcddc5c3d6185699fbbad08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -99,11 +94,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1689488573, "lastModified": 1705559032,
"narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=", "narHash": "sha256-Cb+Jd1+Gz4Wi+8elPnUIHnqQmE1qjDRZ+PsJaPaAffY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "39096fe3f379036ff4a5fa198950b8e79defe939", "rev": "e132ea0eb0c799a2109a91688e499d7bf4962801",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +125,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,22 +154,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -201,11 +180,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1705309234,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +216,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1701680307,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +260,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1660459072, "lastModified": 1703887061,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +280,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705879479, "lastModified": 1706134977,
"narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +321,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1705911882, "lastModified": 1706078134,
"narHash": "sha256-S5wqI5xX3nRSJi1ZrR4x+bA7mzuMRMOnoUNXGIvExeI=", "narHash": "sha256-l6ZkbXi4Tv2S2HOJhLjL7iCrSy5cAMLbEp0hR5IiIBg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "kde2nix", "repo": "kde2nix",
"rev": "79e792034cffa8b697b6c1a4a9d7310736822fc8", "rev": "22331df82eec03417bc083371793c618e2a6eb52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,6 +355,21 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1705332318,
"narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1693701915, "lastModified": 1693701915,
@ -397,11 +391,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1705931262, "lastModified": 1706085261,
"narHash": "sha256-JU8Dn3FeLlpC2aCXDbVH+E9koZYw/r1LW+fofWq87mE=", "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "ed8ab00e8d92076a7cac1b428881b4d5304bb771", "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +438,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1705774713, "lastModified": 1705916986,
"narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,16 +486,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705911640, "lastModified": 1705936081,
"narHash": "sha256-auO4spQ1+4HA8NtpAcrRkKz6I9t/Yk5GBeZgQ5/6pYI=", "narHash": "sha256-koT6JZMFkA/EDZLSdkTa2LgEjM+JLKWWZyyARbh2yLE=",
"owner": "K900", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "df8dfca854b41c3addcdb0f0f481c203d9728e3c", "rev": "f048098f0b0945a9054e11ae5dba08b5688b0be1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "K900", "owner": "NixOS",
"ref": "kdsoap-fix", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -565,11 +559,11 @@
"pre-commit-hooks": "pre-commit-hooks_2" "pre-commit-hooks": "pre-commit-hooks_2"
}, },
"locked": { "locked": {
"lastModified": 1705961248, "lastModified": 1706111147,
"narHash": "sha256-sqK417zKqVoxallioKRtHMSssOJT6gEpQ9FIuBKIoG0=", "narHash": "sha256-4VtYk79oJExuHxwN/5NIzLBzq4VVcfbnXawJMUIXrrc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "01c21406c6f4f6c137f861f9503572c5d0c9d98b", "rev": "ddce82d0d1fb88c957ecb7debed2ae6c63b60750",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -580,7 +574,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-utils": [ "flake-utils": [
"kde2nix", "kde2nix",
"flake-utils" "flake-utils"
@ -608,7 +602,7 @@
}, },
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
@ -621,11 +615,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702456155, "lastModified": 1705757126,
"narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -652,11 +646,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689441253, "lastModified": 1705523001,
"narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=", "narHash": "sha256-TWq5vJ6m+9HGSDMsQAmz1TMegMi79R3TTyKjnPWsQp8=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8", "rev": "9d9b34354d2f13e33568c9c55b226dd014a146a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -682,44 +676,17 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"conduit",
"crane",
"flake-utils"
],
"nixpkgs": [
"conduit",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1688351637,
"narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f9b92316727af9e6c7fee4a761242f7f46880329",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1705805983, "lastModified": 1706130372,
"narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=", "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ae171b54e76ced88d506245249609f8c87305752", "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -38,7 +38,7 @@
}; };
lightline.enable = true; lightline.enable = true;
toggleterm.enable = true; toggleterm.enable = true;
#rainbow-delimiters.enable = true; rainbow-delimiters.enable = true;
treesitter.enable = true; treesitter.enable = true;
barbar.enable = true; barbar.enable = true;
gitgutter.enable = true; gitgutter.enable = true;
@ -49,18 +49,18 @@
luasnip.enable = true; luasnip.enable = true;
#lsp = { lsp = {
# enable = true; enable = true;
# servers = { servers = {
# nil_ls.enable = true; nil_ls.enable = true;
# rust-analyzer.enable = true; rust-analyzer.enable = true;
# rust-analyzer.installRustc = false; # use rustc in nix shells, maybe? rust-analyzer.installRustc = false; # use rustc in nix shells, maybe?
# rust-analyzer.installCargo = false; rust-analyzer.installCargo = false;
# tsserver.enable = true; tsserver.enable = true;
# htmx.enable = true; htmx.enable = true;
# html.enable = true; html.enable = true;
# }; };
#}; };
}; };
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [

View file

@ -9,7 +9,6 @@ in
]; ];
programs.nheko.enable = true; programs.nheko.enable = true;
#services.gnome-keyring.enable = true;
home = { home = {
inherit homeDirectory; inherit homeDirectory;
@ -18,7 +17,6 @@ in
packages = with pkgs; [ packages = with pkgs; [
profanity profanity
gomuks gomuks
]; ];
}; };
} }

View file

@ -16,6 +16,5 @@
htop htop
neofetch neofetch
xclip xclip
keepassxc
]; ];
} }

View file

@ -17,13 +17,13 @@
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = true;
powerManagement.finegrained = false; powerManagement.finegrained = false;
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.stable; package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.beta;
}; };
} }

View file

@ -3,7 +3,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../client.nix ../../client.nix
../../features/xfce.nix ../../features/plasma5.nix
../../features/tailscale.nix ../../features/tailscale.nix
../../features/sound ../../features/sound
../../features/nvidia.nix ../../features/nvidia.nix