jalr/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump to nixos release 22.05

Browse source
This commit is contained in:
Jakob Lechner 2022-06-08 08:03:53 +00:00
parent bce6bb1e15
commit d7f1ae19f8
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
11 changed files with 33 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

43
flake.lock generated
View file

@ -22,16 +22,16 @@
]
},
"locked": {
"lastModified": 1651519540,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
"lastModified": 1654113405,
"narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
"rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.11",
"ref": "release-22.05",
"repo": "home-manager",
"type": "github"
}
@ -41,9 +41,7 @@
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs-unstable"
]
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1652714503,
@ -62,18 +60,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1654346688,
"narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=",
"lastModified": 1645655918,
"narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45",
"rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs-21_11": {
@ -108,29 +104,29 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"nixpkgs_2": {
"locked": {
"lastModified": 1654230545,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"lastModified": 1654540670,
"narHash": "sha256-qNg3cUyDWvkC5AUZZEQ9WWb49Y/BT4HQ10e/8wfvcgY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"rev": "f05e7d39a48db1cd5bcdc7775e171779d7b4a8a6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1654488445,
"narHash": "sha256-S22XCa7raOBV1wchfRZOYYNTOcmOfZW71OecXIs/w6s=",
"lastModified": 1654663271,
"narHash": "sha256-pxQ65qQg1n1IzXV6Tkq7cpkfsyxon21Yf+LINGOA5W8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "7f336d5794060691d93225b2159549a32c59e687",
"rev": "59897b55e6391d99c50d86dc297babd007a74a09",
"type": "github"
},
"original": {
@ -144,8 +140,7 @@
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nix-pre-commit-hooks": "nix-pre-commit-hooks",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"sops-nix": "sops-nix"
}

6
flake.nix
View file

@ -1,20 +1,18 @@
{
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
nur.url = "github:nix-community/NUR";
home-manager = {
url = "github:nix-community/home-manager/release-21.11";
url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix/master";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
sops-nix = {

1
home-manager/modules/direnv.nix
View file

@ -3,7 +3,6 @@
enable = true;
nix-direnv = {
enable = true;
enableFlakes = true;
};
};
}

2
home-manager/modules/neovim.nix
View file

@ -102,7 +102,7 @@
-- Python
lsp.pylsp.setup {
on_attach = on_attach,
cmd = { "${pkgs.python38Packages.python-lsp-server}/bin/pylsp" },
cmd = { "${pkgs.python310Packages.python-lsp-server}/bin/pylsp" },
settings = {
-- https://github.com/python-lsp/python-lsp-server/blob/develop/CONFIGURATION.md
pylsp = {

2
home-manager/modules/sway/move-to-output/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
chmod +x $out/bin/move-to-output
'';
script = ''
#!${pkgs.python39}/bin/python
#!${pkgs.python310}/bin/python
import sys
import json
import subprocess

6
home-manager/users/jal.nix
View file

@ -73,9 +73,9 @@
pinentry-gnome
psutils
pwgen
python39
python39Packages.virtualenv
python39Packages.ipython
python310
python310Packages.virtualenv
python310Packages.ipython
qtpass
ripgrep
screen

7
home-manager/users/jalr.nix
View file

@ -42,7 +42,6 @@
home.packages = with pkgs; [
audacity
axoloti
claws-mail
cutecom
ghostscript
@ -93,9 +92,9 @@
pinentry-gnome
psutils
pwgen
python39
python39Packages.virtualenv
python39Packages.ipython
python310
python310Packages.virtualenv
python310Packages.ipython
qtpass
ripgrep
screen

1
machines/cadmium/configuration.nix
View file

@ -32,7 +32,6 @@
git
gnome3.adwaita-icon-theme
htop
ike
jq
neovim
openconnect

1
machines/hafnium/configuration.nix
View file

@ -38,7 +38,6 @@
git
gnome3.adwaita-icon-theme
htop
ike
jq
neovim
openconnect

2
modules/sway.nix
View file

@ -7,7 +7,7 @@ lib.mkIf config.myConfig.gui.enable {
extraPackages = with pkgs; [
grim
mako
redshift-wlr
gammastep
slurp
wl-clipboard
xwayland

6
pkgs/mute-indicator/default.nix
View file

@ -1,12 +1,12 @@
{ python39Packages }:
{ python310Packages }:
python39Packages.buildPythonApplication rec {
python310Packages.buildPythonApplication rec {
pname = "mute-indicator";
version = "0.0.1";
src = ./.;
propagatedBuildInputs = with python39Packages; [
propagatedBuildInputs = with python310Packages; [
python
pulsectl
pyserial