Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-01 17:50:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update x2100

Browse source
This commit is contained in:
Julien Malka 2023-12-06 10:41:38 +01:00
parent 169b288244
commit 82c820b086
Signed by: Luj
GPG key ID: 6FC74C847011FD83
5 changed files with 108 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
flake.lock generated
View file

@ -170,6 +170,26 @@
} }
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1701829164,
"narHash": "sha256-1b09sNIyYcUsXRR2rk3yxKDPCtnKrsM81d8FRXs96HU=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "384abdc7504cb95d3df0ea1f72f01f1b5b2b039f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-overlay_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676366521, "lastModified": 1676366521,
@ -426,11 +446,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1701680307,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,6 +495,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"format-all": { "format-all": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -537,7 +575,7 @@
}, },
"home-manager-unstable": { "home-manager-unstable": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1701071203, "lastModified": 1701071203,
@ -575,8 +613,8 @@
"crane": "crane_2", "crane": "crane_2",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
@ -623,7 +661,7 @@
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"doom-snippets": "doom-snippets", "doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay_2",
"emacs-so-long": "emacs-so-long", "emacs-so-long": "emacs-so-long",
"evil-escape": "evil-escape", "evil-escape": "evil-escape",
"evil-markdown": "evil-markdown", "evil-markdown": "evil-markdown",
@ -631,12 +669,12 @@
"evil-quick-diff": "evil-quick-diff", "evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode", "explain-pause-mode": "explain-pause-mode",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"format-all": "format-all", "format-all": "format-all",
"nix-straight": [ "nix-straight": [
"nix-straight" "nix-straight"
], ],
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_6",
"nose": "nose", "nose": "nose",
"ob-racket": "ob-racket", "ob-racket": "ob-racket",
"org": "org", "org": "org",
@ -756,6 +794,22 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1701540982,
"narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -788,6 +842,22 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1701436327,
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1700794826, "lastModified": 1700794826,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
@ -803,7 +873,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1699354722, "lastModified": 1699354722,
"narHash": "sha256-abmqUReg4PsyQSwv4d0zjcWpMHrd3IFJiTb2tZpfF04=", "narHash": "sha256-abmqUReg4PsyQSwv4d0zjcWpMHrd3IFJiTb2tZpfF04=",
@ -819,7 +889,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1695806987, "lastModified": 1695806987,
"narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
@ -834,7 +904,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1701058557, "lastModified": 1701058557,
"narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=", "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=",
@ -850,7 +920,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1700924682, "lastModified": 1700924682,
"narHash": "sha256-7vP/KtJdKSWnghtPVDoE7MD+rCY3gFj68NwOMNdrGbs=", "narHash": "sha256-7vP/KtJdKSWnghtPVDoE7MD+rCY3gFj68NwOMNdrGbs=",
@ -991,7 +1061,7 @@
"lanzaboote", "lanzaboote",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1699271226, "lastModified": 1699271226,
@ -1028,7 +1098,8 @@
"attic": "attic", "attic": "attic",
"buildbot-nix": "buildbot-nix", "buildbot-nix": "buildbot-nix",
"colmena": "colmena", "colmena": "colmena",
"flake-utils": "flake-utils_2", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils_3",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"homepage": "homepage", "homepage": "homepage",
@ -1038,7 +1109,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixd": "nixd", "nixd": "nixd",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_7",
"nur": "nur", "nur": "nur",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -1258,6 +1329,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1329,7 +1415,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -1362,7 +1448,7 @@
}, },
"zotero-nix": { "zotero-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_8",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {

1
flake.nix
View file

@ -82,6 +82,7 @@
zotero-nix.url = "github:camillemndn/zotero-nix"; zotero-nix.url = "github:camillemndn/zotero-nix";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
emacs-overlay.url = "github:nix-community/emacs-overlay";
}; };
outputs = { self, nixpkgs, ... }@inputs: outputs = { self, nixpkgs, ... }@inputs:

1
lib/mkmachine.nix
View file

@ -40,6 +40,7 @@ nixpkgs.lib.nixosSystem {
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay
inputs.nur.overlay inputs.nur.overlay
(overlay-unstable system) (overlay-unstable system)
(final: prev: (final: prev:

18
machines/x2100/default.nix
View file

@ -82,15 +82,11 @@
# for a WiFi printer # for a WiFi printer
services.avahi.openFirewall = true; services.avahi.openFirewall = true;
services.davfs2 = {
enable = true;
};
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
programs.sway.enable = true; programs.sway.enable = true;
programs.sway.package = null; programs.sway.package = null;
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
@ -100,20 +96,6 @@
"zotero-6.0.27" "zotero-6.0.27"
]; ];
services.autofs = {
enable = true;
debug = true;
autoMaster =
let
mapConf = pkgs.writeText "auto" ''
nuage -fstype=davfs,uid=1000,file_mode=600,dir_mode=700,conf=/home/julien/.davfs2/davfs2.conf,rw :https\://nuage.malka.family/remote.php/webdav/
'';
in
''
/home/julien/clouds file:${mapConf}
'';
};
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }

3
machines/x2100/home-julien.nix
View file

@ -12,7 +12,6 @@
luj.programs.waybar.enable = true; luj.programs.waybar.enable = true;
luj.programs.waybar.interfaceName = "wlp3s0"; luj.programs.waybar.interfaceName = "wlp3s0";
luj.programs.kitty.enable = true; luj.programs.kitty.enable = true;
luj.programs.emacs.enable = true;
luj.programs.zsh.enable = true; luj.programs.zsh.enable = true;
luj.emails.enable = true; luj.emails.enable = true;
luj.programs.firefox.enable = true; luj.programs.firefox.enable = true;
@ -54,11 +53,13 @@
fira-code fira-code
feh feh
meld meld
emacsGit
vlc vlc
jftui jftui
nerdfonts nerdfonts
libreoffice libreoffice
font-awesome font-awesome
cantarell-fonts
nodejs nodejs
neomutt neomutt
htop htop