partial 23.11 migration
This commit is contained in:
parent
173588996c
commit
7b812bbad2
2
base.nix
2
base.nix
|
|
@ -18,7 +18,9 @@
|
|||
# TODO: how can i do this in home-manager?
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"pulsar-1.106.0"
|
||||
"pulsar-1.109.0"
|
||||
"zotero-6.0.26"
|
||||
"gitea-1.19.4"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
101
flake.lock
101
flake.lock
|
|
@ -43,11 +43,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695108154,
|
||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
||||
"lastModified": 1700392168,
|
||||
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
||||
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -57,6 +57,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager-2311": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-2311"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702195709,
|
||||
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"katex": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -144,11 +165,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1697100850,
|
||||
"narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
|
||||
"lastModified": 1701656485,
|
||||
"narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
|
||||
"rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -159,11 +180,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1696983906,
|
||||
"narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
|
||||
"lastModified": 1701805708,
|
||||
"narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
|
||||
"rev": "0561103cedb11e7554cf34cea81e5f5d578a4753",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -173,6 +194,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2311": {
|
||||
"locked": {
|
||||
"lastModified": 1701952659,
|
||||
"narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1696717752,
|
||||
|
|
@ -189,6 +226,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1702148972,
|
||||
"narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1686582075,
|
||||
|
|
@ -247,11 +300,14 @@
|
|||
"inputs": {
|
||||
"flake-programs-sqlite": "flake-programs-sqlite",
|
||||
"home-manager": "home-manager",
|
||||
"home-manager-2311": "home-manager-2311",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-2311": "nixpkgs-2311",
|
||||
"pbsds-papers": "pbsds-papers",
|
||||
"sops-nix": "sops-nix",
|
||||
"sops-nix-2311": "sops-nix-2311",
|
||||
"unstable": "unstable"
|
||||
}
|
||||
},
|
||||
|
|
@ -276,13 +332,34 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"sops-nix-2311": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-2311"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702177193,
|
||||
"narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1697059129,
|
||||
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
|
||||
"lastModified": 1701718080,
|
||||
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
|
||||
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -3,14 +3,12 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; # gnome plugins broken
|
||||
nixpkgs-2311.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||
nixpkgs-2311.url = "github:NixOS/nixpkgs/nixos-23.11"; # gnome plugins broken
|
||||
|
||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
# https://github.com/nix-community/home-manager
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||
#home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager-2311.url = "github:nix-community/home-manager/release-23.11";
|
||||
home-manager-2311.inputs.nixpkgs.follows = "nixpkgs-2311";
|
||||
|
|
@ -173,12 +171,12 @@
|
|||
};
|
||||
mkHosts = mk: with nixos-hardware.nixosModules; {
|
||||
# TODO: move nixos-hardware imports to the nixos configs?
|
||||
noximilien = mk "noximilien" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
noximilien = mk "noximilien" "pbsds.net" "x86_64-linux" inputs-2311 [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
brumlebasse = mk "brumlebasse" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-amd ];
|
||||
nord = mk "nord" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ];
|
||||
sopp = mk "sopp" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ];
|
||||
bolle = mk "bolle" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
eple = mk "eple" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
bolle = mk "bolle" "pbsds.net" "x86_64-linux" inputs-2311 [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
eple = mk "eple" "pbsds.net" "x86_64-linux" inputs-2311 [ common-pc common-pc-ssd common-cpu-intel ];
|
||||
garp = mk "garp" "pbsds.net" "x86_64-linux" inputs [ common-pc common-pc-ssd common-cpu-intel ]; # TODO: common-gpu-nvidia-nonprime ];
|
||||
#gomperud smattkuken skrytebiffen skalkesnerken balleby brumlebasse bingus skjrlaltatjlstad
|
||||
#bergjlot snortheimsmoen ditlefsen skrukkerud podebusk zmaragd makrell alfnes blix urke eple hasselknippe pytte uddu imdorf rosenqvist
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
# TODO: depend on nox.networking.interfaces.eno1.ipv4.addresses
|
||||
(map (mkMount "/mnt/meconium" "192.168.1.9:/Meconium" ) [
|
||||
""
|
||||
"/backups"
|
||||
"/backups/rocm"
|
||||
"/beets_music"
|
||||
])
|
||||
);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
htop
|
||||
glances
|
||||
bottom
|
||||
zenith
|
||||
#zenith # waiting for backport of build fix
|
||||
|
||||
#sshfs
|
||||
entr
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
settings.urlAddPort = false;
|
||||
|
||||
settings.db.dialect = "sqlite";
|
||||
settings.db.storage = "${config.services.hedgedoc.workDir}/db.sqlite";
|
||||
settings.db.storage = "/var/lib/hedgedoc/db.sqlite";
|
||||
|
||||
settings.email = false; # email sign-in
|
||||
settings.allowFreeURL = true; # allow note creation by accessing a nonexistent note URL.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Invidious
|
||||
# An open source alternative front-end to YouTube
|
||||
|
||||
/**/
|
||||
/** /
|
||||
disabledModules = [ "services/web-apps/invidious.nix" ];
|
||||
#imports = [ <nixos-unstable/nixos/modules/services/web-apps/invidious.nix> ];
|
||||
imports = [ ("${inputs.unstable}/nixos/modules/services/web-apps/invidious.nix") ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
home.packages = with pkgs; [
|
||||
gnome.gnome-tweaks
|
||||
pkgs.vimix-gtk-themes # shell theme
|
||||
gnomeExtensions.big-avatar
|
||||
#gnomeExtensions.big-avatar
|
||||
gnomeExtensions.bluetooth-quick-connect
|
||||
gnomeExtensions.gtile
|
||||
gnomeExtensions.just-perfection
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
#thumbnail # TOO SLOW
|
||||
thumbfast
|
||||
mpris
|
||||
# TODO: thumbfast
|
||||
flakes.self.pkgs.mpv-webm # activate with SHIFT+W
|
||||
(pkgs.mpvScripts.mpv-webm or flakes.self.pkgs.mpv-webm) # activate with SHIFT+W
|
||||
# from https://github.com/mpv-player/mpv/issues/9767#issuecomment-1024831645
|
||||
({ scriptName = "dynamic-subs.lua"; } // (pkgs.writeTextDir "share/mpv/scripts/dynamic-subs.lua" ''
|
||||
mp.add_hook('on_load', 10, function()
|
||||
|
|
|
|||
Loading…
Reference in New Issue