artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update, fix warnings

Browse source
This commit is contained in:
Artemis Tosini 2024-06-26 08:40:08 +00:00
parent ea74deff3d
commit 825027529b
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
9 changed files with 86 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

173
flake.lock
View file

@ -63,11 +63,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718440858, "lastModified": 1719128254,
"narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=", "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "58b905ea87674592aa84c37873e6c07bc3807aba", "rev": "50581970f37f06a4719001735828519925ef8310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713532798, "lastModified": 1717408969,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,11 +173,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1717285511,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,24 +204,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"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"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -263,6 +245,33 @@
"url": "https://git.mildlyfunctional.gay/artemist/fonts.git" "url": "https://git.mildlyfunctional.gay/artemist/fonts.git"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -289,7 +298,7 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"pre-commit-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -314,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718243258, "lastModified": 1719385710,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +344,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718431241, "lastModified": 1719380852,
"narHash": "sha256-vOsklVeiGCvf9LBOz0sjHMNvohgUw8/Oe/8MpdFnF+Y=", "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=",
"owner": "jovian-experiments", "owner": "jovian-experiments",
"repo": "jovian-nixos", "repo": "jovian-nixos",
"rev": "f02a01aab60c68b7898043c2e7f5bc97c93fb07b", "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,11 +389,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718422199, "lastModified": 1719353906,
"narHash": "sha256-GEssRN+MrA2by5nD1xeQBMNXye/Yp+MOBngov7RTfAk=", "narHash": "sha256-Tb0qMlbG/+DvnnBtgJtByBF1vh8pGIUXv0lhivYCCH8=",
"rev": "9923fb6dd95b13f14b60e6482e928a1eb2176cd1", "rev": "4ac2c496d499a4a0e2d64edf32eb855268e7aa8d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9923fb6dd95b13f14b60e6482e928a1eb2176cd1.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4ac2c496d499a4a0e2d64edf32eb855268e7aa8d.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -405,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717647344, "lastModified": 1719353937,
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=",
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164", "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4e25f1ab68f2270f9cff59216056c21073db0164.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5d9d94089fb1ca96222a34bfe245ef5c5ebefd37.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -423,11 +432,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718011381, "lastModified": 1719111455,
"narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +447,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718429294, "lastModified": 1719322773,
"narHash": "sha256-uhKuPVN8IZJCWwFhNupTxES7LMo8ot2KC6+VmVWwzyU=", "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "239c3864fef6292262d23cff58ce81674f309142", "rev": "caabc425565bbd5c8640630b0bf6974961a49242",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +462,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1719254875,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,6 +497,7 @@
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
], ],
@ -497,48 +507,19 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1714600955, "lastModified": 1719379691,
"narHash": "sha256-AHz9OVQeVlbhTboR5Wchjet9a2h+a8aPTDjEyVQLz/g=", "narHash": "sha256-aJ10tTQ3aJZYHOS0FixRKFHQqN+kPaCyw0q5pejv7hA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "82a19581defe682ff9ca7cb8b1b980b6dc297cf2", "rev": "b64ee08d6b08b36b33fd1644b374ec2a5fd1a193",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "82a19581defe682ff9ca7cb8b1b980b6dc297cf2",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713954846,
"narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@ -686,24 +667,30 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1719243788,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,

2
flake.nix
View file

@ -43,7 +43,7 @@
inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim/82a19581defe682ff9ca7cb8b1b980b6dc297cf2"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
inputs.nix-darwin.follows = "darwin"; inputs.nix-darwin.follows = "darwin";

18
sets/base.nix
View file

@ -29,24 +29,6 @@
overlays = [ overlays = [
inputs.artemist.overlays.default inputs.artemist.overlays.default
inputs.fonts.overlays.default inputs.fonts.overlays.default
(final: prev: {
nheko = prev.nheko.overrideAttrs (attrs: {
patches =
attrs.patches
++ (with final; [
(fetchpatch {
name = "custom-reactions-display.patch";
url = "https://github.com/Nheko-Reborn/nheko/commit/2f1b3519d38c99ded45c1a9d9e86f5d4dd961238.patch";
hash = "sha256-1/7jisXw+VfC65SeDC15yVuHqx01OJlJkOVGeIiLeN4=";
})
(fetchpatch {
name = "custom-reactions-history.patch";
url = "https://github.com/Nheko-Reborn/nheko/commit/1994ea634eab69478cfdf1da37cbb9de62dbe595.patch";
hash = "sha256-P3nG9s4TWBwcEmEJlTpFsM4QQbRYNGmcRC4zZW8Zj4Y=";
})
]);
});
})
]; ];
config.allowUnfreePredicate = config.allowUnfreePredicate =
pkg: pkg:

2
sets/nvim.nix
View file

@ -77,7 +77,7 @@ lib.setAttrByPath setPath (
clangd.enable = cfg.plugins.lsp.enable; clangd.enable = cfg.plugins.lsp.enable;
java-language-server.enable = cfg.plugins.lsp.enable; java-language-server.enable = cfg.plugins.lsp.enable;
jsonls.enable = cfg.plugins.lsp.enable; jsonls.enable = cfg.plugins.lsp.enable;
nil_ls.enable = cfg.plugins.lsp.enable; nil-ls.enable = cfg.plugins.lsp.enable;
omnisharp.enable = cfg.plugins.lsp.enable; omnisharp.enable = cfg.plugins.lsp.enable;
pylsp = { pylsp = {
enable = cfg.plugins.lsp.enable; enable = cfg.plugins.lsp.enable;

1
sets/packages.nix
View file

@ -55,7 +55,6 @@
libarchive libarchive
lsof lsof
nix-output-monitor nix-output-monitor
nix-top
openssl openssl
parallel parallel
pciutils pciutils

2
sets/sway.nix
View file

@ -48,7 +48,7 @@
xsettingsd xsettingsd
]; ];
hardware.opengl.enable = true; hardware.graphics.enable = true;
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
programs.dconf.enable = true; programs.dconf.enable = true;
programs.xwayland.enable = true; programs.xwayland.enable = true;

2
sets/workstation.nix
View file

@ -57,7 +57,7 @@
hardware = { hardware = {
bluetooth.enable = true; bluetooth.enable = true;
opengl.driSupport32Bit = (pkgs.system == "x86_64-linux"); graphics.enable32Bit = (pkgs.system == "x86_64-linux");
steam-hardware.enable = true; steam-hardware.enable = true;
sane = { sane = {
enable = true; enable = true;

2
sets/xonsh.nix
View file

@ -30,7 +30,7 @@ in
$UPDATE_OS_ENVIRON = True $UPDATE_OS_ENVIRON = True
xontrib load direnv fish_completer xontrib load direnv fish_completer
''; '';
package = pkgs.xonsh.override { package = pkgs.xonsh.wrapper.override {
extraPackages = ps: [ extraPackages = ps: [
(xonsh-direnv ps) (xonsh-direnv ps)
(xontrib-fish-completer ps) (xontrib-fish-completer ps)

2
system/rainbowdash/default.nix
View file

@ -69,7 +69,7 @@
services.printing.drivers = with pkgs; [ cups-dymo ]; services.printing.drivers = with pkgs; [ cups-dymo ];
# Not in nixos-hardware for some reason # Not in nixos-hardware for some reason
hardware.opengl.extraPackages = with pkgs; [ intel-compute-runtime ]; hardware.graphics.extraPackages = with pkgs; [ intel-compute-runtime ];
boot.blacklistedKernelModules = [ "psmouse" ]; boot.blacklistedKernelModules = [ "psmouse" ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;