geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

25.11 working without too many warnings

Browse source
This commit is contained in:
Geoffrey Frogeye 2025-11-30 22:14:24 +01:00
parent 8cf1959759
commit 7a8ff873c6
17 changed files with 157 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

2
curacao/co2meter/default.nix
View file

@ -19,6 +19,8 @@ let
paho-mqtt paho-mqtt
pyaml pyaml
]; ];
pyproject = true;
build-system = [ pkgs.python3Packages.setuptools ];
}; };
usb_zytemp_udev = pkgs.stdenv.mkDerivation { usb_zytemp_udev = pkgs.stdenv.mkDerivation {
pname = "usb-zytemp-udev-rules"; pname = "usb-zytemp-udev-rules";

163
flake.lock generated
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1746562888, "lastModified": 1755819240,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748408240, "lastModified": 1760703920,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761899396, "lastModified": 1764627417,
"narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748383148, "lastModified": 1764724327,
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1763759067,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1763759067,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,18 +221,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744584021, "host": "gitlab.gnome.org",
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "48.1", "ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "gitlab"
} }
}, },
"home-manager": { "home-manager": {
@ -242,16 +244,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1764866045,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "home-manager", "id": "home-manager",
"ref": "release-25.05", "ref": "release-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -338,11 +340,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1761933221, "lastModified": 1764440730,
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7467f155fcba189eb088a7601f44fbef7688669b", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,16 +354,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761999846, "lastModified": 1764831616,
"narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -399,11 +401,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1764667669,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,16 +425,16 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1762083835, "lastModified": 1764755396,
"narHash": "sha256-O5cqRhOiKDCHBZze4VJBZqRjX4B+DttSkAJcTEhDv1k=", "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "87abad151f662238ce9946895850609c1ca42a68", "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }
@ -481,11 +483,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1762168729, "lastModified": 1764924152,
"narHash": "sha256-dChBf7402mBrjuNaARy23QAS+9WPK7I023jPmZTeDiI=", "narHash": "sha256-+4mV/0gqpxB3n5VMnQKbs0Lgwr5gm/eeMQNYKmQsHu0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e2cdcbcb30d44aa77fbf8a92e01f4ce668b9e642", "rev": "4d4437b23ce717811abf782a6f64a9f6e7a7a9bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,15 +505,14 @@
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1751320053, "lastModified": 1764773531,
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,16 +546,16 @@
}, },
"onixpkgs": { "onixpkgs": {
"locked": { "locked": {
"lastModified": 1751274312, "lastModified": 1764560356,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -611,16 +612,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1761668239, "lastModified": 1764836393,
"narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=", "narHash": "sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp+Rkj6pqS8o=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a149a557dc306e76d53e7dd488826e61ef9c6289", "rev": "6f3b50c8fa9c468fc787e211b700e46592bf9d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -721,11 +722,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750770351, "lastModified": 1763914658,
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +738,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751159871, "lastModified": 1764465359,
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -753,11 +754,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751158968, "lastModified": 1764464512,
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -766,35 +767,13 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unixpkgs": { "unixpkgs": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1764667669,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
flake.nix
View file

@ -3,8 +3,8 @@
inputs = { inputs = {
# Packages # Packages
onixpkgs.url = "nixpkgs/nixos-24.11"; onixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.11";
unixpkgs.url = "nixpkgs/nixos-unstable"; unixpkgs.url = "nixpkgs/nixos-unstable";
zelbarnixpkgs.url = "github:wlcx/nixpkgs/zelbar"; zelbarnixpkgs.url = "github:wlcx/nixpkgs/zelbar";
# OS # OS
@ -15,21 +15,21 @@
nixos-hardware.url = "nixos-hardware"; nixos-hardware.url = "nixos-hardware";
# NOD # NOD
nix-on-droid = { nix-on-droid = {
url = "github:nix-community/nix-on-droid"; # No 25.05 yet url = "github:nix-community/nix-on-droid"; # Doesn't have release branches anymore, unsure of project sttaus
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
# HM # HM
home-manager = { home-manager = {
url = "home-manager/release-25.05"; url = "home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-25.05"; url = "github:danth/stylix/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim/nixos-25.05"; url = "github:nix-community/nixvim/nixos-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -41,6 +41,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
onixpkgs,
unixpkgs, unixpkgs,
zelbarnixpkgs, zelbarnixpkgs,
disko, disko,
@ -64,12 +65,16 @@
self: super: self: super:
let let
upkgs = import unixpkgs { inherit (super) system; }; upkgs = import unixpkgs { inherit (super) system; };
opkgs = import onixpkgs { inherit (super) system; };
in in
{ {
# hello = upkgs.hello; # Take package and dependencies: heavier # inherit (upkgs) hello; # Take package and dependencies: heavier
# hello = super.callPackage "${unixpkgs}/pkgs/by-name/he/hello/package.nix" { }; # Take package only: not always possible # hello = super.callPackage "${unixpkgs}/pkgs/by-name/he/hello/package.nix" { }; # Take package only: not always possible
zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { }; zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" {
fluffychat = upkgs.fluffychat; # unstable so we have 2.0 which doesn't have security warnings zig = super.zig_0_14;
};
inherit (opkgs) ansible-language-server; # Removed before 25.11 for annoying upstream reasons
# https://github.com/NixOS/nixpkgs/pull/445884/commits/713e8c57f16b0785bb4cdd88662078a742188f13
} }
) )
]; ];
@ -88,9 +93,9 @@
inherit system; inherit system;
specialArgs = attrs // { specialArgs = attrs // {
# Cherry-pick packages from other places without overlays. # Cherry-pick packages from other places without overlays.
upkgs = import unixpkgs { # Will not propagate to hm
inherit system; upkgs = import unixpkgs { inherit system; };
}; opkgs = import onixpkgs { inherit system; };
}; };
modules = modules ++ [ modules = modules ++ [
self.nixosModules.dotfiles self.nixosModules.dotfiles

6
hm/common.nix
View file

@ -63,12 +63,6 @@
oldestFile = ''${pkgs.findutils}/bin/find -type f -printf '%T+ %p\n' | sort | head''; oldestFile = ''${pkgs.findutils}/bin/find -type f -printf '%T+ %p\n' | sort | head'';
}; };
tealdeer.enable = true; tealdeer.enable = true;
thefuck = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
# TODO enableXIntegration options might not be needed anymore
};
lsd = { lsd = {
enable = true; enable = true;
# Don't want the default aliases # Don't want the default aliases

4
hm/desktop/default.nix
View file

@ -161,7 +161,9 @@
gimp gimp
inkscape inkscape
libreoffice libreoffice
jellyfin-media-player # Does not prevent the screen from sleeping # jellyfin-media-player # Does not prevent the screen from sleeping
# Commented out for 25.11 since qt5 webengine is insecure.
# 26.05 See if this changed.
jellyfin-mpv-shim # No UI, needs remote jellyfin-mpv-shim # No UI, needs remote
# data management # data management

7
hm/desktop/frobar/default.nix
View file

@ -1,10 +1,13 @@
{ {
zelbarnixpkgs ? builtins.getFlake "github:wlcx/nixpkgs/zelbar", zelbarnixpkgs ? builtins.getFlake "github:wlcx/nixpkgs/zelbar",
nixpkgs ? <nixpkgs>, # nixpkgs ? <nixpkgs>,
nixpkgs ? builtins.getFlake "nixpkgs/nixos-25.11",
pkgs ? import nixpkgs { pkgs ? import nixpkgs {
overlays = [ overlays = [
(self: super: { (self: super: {
zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { }; zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" {
zig = super.zig_0_14;
};
}) })
]; ];
}, },

2
hm/desktop/mpd/default.nix
View file

@ -9,7 +9,7 @@
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
ashuffle ashuffle
mpc-cli mpc
vimpc vimpc
playerctl playerctl
]; ];

11
hm/dev/common.nix
View file

@ -1,4 +1,8 @@
{ pkgs, config, ... }: {
pkgs,
config,
...
}:
{ {
# TODO Maybe should be per-directory dotenv # TODO Maybe should be per-directory dotenv
# Or not, for neovim # Or not, for neovim
@ -50,7 +54,10 @@
]; ];
programs.nixvim.plugins.lsp.servers = { programs.nixvim.plugins.lsp.servers = {
ansiblels.enable = config.frogeye.dev.ansible; # Ansible ansiblels = {
enable = config.frogeye.dev.ansible; # Ansible
package = pkgs.ansible-language-server;
};
bashls.enable = true; # Bash bashls.enable = true; # Bash
jsonls.enable = true; # JSON jsonls.enable = true; # JSON
lua_ls.enable = true; # Lua (for Neovim debugging) lua_ls.enable = true; # Lua (for Neovim debugging)

2
hm/gaming/default.nix
View file

@ -12,7 +12,7 @@
packages = with pkgs; [ packages = with pkgs; [
# gaming # gaming
# dolphin-emu # 25.11 Put back? Removed because mbedtls 2 is insecure # dolphin-emu # 25.11 Put back? Removed because mbedtls 2 is insecure
ryujinx ryubing
prismlauncher prismlauncher
# TODO factorio # TODO factorio

36
hm/git/default.nix
View file

@ -43,11 +43,16 @@ in
}) })
]; ];
programs = { programs = {
delta = {
enable = true;
options = {
line-numbers = true;
syntax-theme = "base16";
};
enableGitIntegration = true;
};
git = { git = {
package = pkgs.gitFull; package = pkgs.gitFull;
aliases = {
"git" = "!exec git"; # In case I write one too many git
};
ignores = [ ignores = [
"*.swp" "*.swp"
"*.swo" "*.swo"
@ -55,20 +60,18 @@ in
"tags" "tags"
".mypy_cache" ".mypy_cache"
]; ];
delta = {
enable = true;
options = {
line-numbers = true;
syntax-theme = "base16";
};
};
# Also tried difftastic, and while I like the default theme it's a bit # Also tried difftastic, and while I like the default theme it's a bit
# less configurable # less configurable
lfs.enable = true; lfs.enable = true;
userEmail = lib.mkDefault "geoffrey@frogeye.fr"; settings = {
userName = lib.mkDefault "Geoffrey Frogeye"; aliases = {
extraConfig = "git" = "!exec git"; # In case I write one too many git
{ };
user = {
email = lib.mkDefault "geoffrey@frogeye.fr";
name = lib.mkDefault "Geoffrey Frogeye";
};
options = {
core = { core = {
editor = "nvim"; editor = "nvim";
}; };
@ -78,6 +81,7 @@ in
pull = { pull = {
ff = "only"; ff = "only";
}; };
} }
// lib.optionalAttrs config.frogeye.desktop.xorg { // lib.optionalAttrs config.frogeye.desktop.xorg {
diff.tool = "meld"; diff.tool = "meld";
@ -86,13 +90,13 @@ in
# This escapes quotes, which isn't the case in the original, hoping this isn't an issue. # This escapes quotes, which isn't the case in the original, hoping this isn't an issue.
}; };
}; };
};
jujutsu = { jujutsu = {
enable = true; enable = true;
settings = { settings = {
git.auto-local-bookmark = true; git.auto-local-bookmark = true;
user = { user = {
email = cfg.userEmail; inherit (cfg.settings.user) email name;
name = cfg.userName;
}; };
ui = { ui = {
pager = "delta"; pager = "delta";

17
hm/ssh.nix
View file

@ -9,11 +9,13 @@
''; '';
programs.ssh = { programs.ssh = {
enable = true; enable = true;
controlMaster = "auto"; enableDefaultConfig = false; # 26.05 I suppose this will be deprecated
controlPersist = "60s"; # Enough to cache Ansible stuff, not too long so I don't have remember which shenanigans I did with my last connection matchBlocks."*" = {
# Ping the server frequently enough so it doesn't think we left (non-spoofable) # Ping the server frequently enough so it doesn't think we left (non-spoofable)
serverAliveInterval = 30; serverAliveInterval = 30;
matchBlocks."*" = { # Keep the connection alive for future connections, making further connections quicker
controlMaster = "auto";
controlPersist = "300s"; # I have the reflex to rm ~/.ssh/master-* for shenanigans
# Do not forward the agent (-A) to a machine by default, # Do not forward the agent (-A) to a machine by default,
# as it is kinda a security concern # as it is kinda a security concern
forwardAgent = false; forwardAgent = false;
@ -23,6 +25,15 @@
# Check SSHFP records # Check SSHFP records
VerifyHostKeyDNS = "yes"; VerifyHostKeyDNS = "yes";
}; };
# Previously default config Home-Manager config
# TODO See which is already SSH config, which we want to keep
addKeysToAgent = "no";
compression = false;
serverAliveCountMax = 3;
hashKnownHosts = false;
userKnownHostsFile = "~/.ssh/known_hosts";
controlPath = "~/.ssh/master-%r@%n:%p";
}; };
}; };
}; };

2
hm/vim/default.nix
View file

@ -185,7 +185,7 @@
}; };
imports = [ imports = [
nixvim.homeManagerModules.nixvim nixvim.homeModules.nixvim
./code.nix ./code.nix
./completion.nix ./completion.nix
./decoration.nix ./decoration.nix

8
hm/vim/git.nix
View file

@ -21,11 +21,13 @@
gitsigns.enable = true; # Show changed lines in the gutter gitsigns.enable = true; # Show changed lines in the gutter
gitlinker = { gitlinker = {
enable = true; # Copy URL of forge corresponding to cursor enable = true; # Copy URL of forge corresponding to cursor
settings = {
callbacks = { callbacks = {
"code.techinc.nl" = "get_gitea_type_url"; "code.techinc.nl".__raw = "require('gitlinker.hosts').get_gitea_type_url";
"git.frogeye.fr" = "get_gitea_type_url"; "git.frogeye.fr".__raw = "require('gitlinker.hosts').get_gitea_type_url";
};
opts.mappings = null; # This option doesn't work, hence manual mappings
}; };
mappings = null; # This option doesn't work, hence manual mappings
}; };
}; };
}; };

4
os/common.nix
View file

@ -51,6 +51,7 @@
nix = { nix = {
gc = { gc = {
# TODO This does not actually collect user profiles, so shit accumulates
automatic = true; automatic = true;
persistent = true; persistent = true;
options = "--delete-older-than 14d"; options = "--delete-older-than 14d";
@ -89,8 +90,7 @@
# Prevent power button from shutting down the computer. # Prevent power button from shutting down the computer.
# On Pinebook it's too easy to hit, # On Pinebook it's too easy to hit,
# on others I sometimes turn it off when unsuspending. # on others I sometimes turn it off when unsuspending.
# FIXME 25.11 now services.logind.settings.Login logind.settings.Login.HandlePowerKey = "ignore";
logind.extraConfig = "HandlePowerKey=ignore";
udev.extraRules = '' udev.extraRules = ''
# DYMO LabelPOINT 350 # DYMO LabelPOINT 350

1
os/geoffrey.nix
View file

@ -5,6 +5,7 @@
home-manager, home-manager,
... ...
}: }:
# 25.11 Consider using home-manager.minimal to reduce evaluation
{ {
config = { config = {
users.users.root.initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password users.users.root.initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password

4
os/password/default.nix
View file

@ -63,7 +63,7 @@ in
${lib.strings.concatLines (builtins.map installPasswordFileSandboxed passwordFiles)} ${lib.strings.concatLines (builtins.map installPasswordFileSandboxed passwordFiles)}
''; '';
}; };
extraSystemBuilderCmds = systemBuilderCommands =
let let
passwords = builtins.attrValues config.vivarium.passwords; passwords = builtins.attrValues config.vivarium.passwords;
readPasswordClear = readPasswordClear =
@ -167,7 +167,7 @@ in
# TODO Find a better mechanism, maybe à la bootspec, or something compatible with cross-arch # TODO Find a better mechanism, maybe à la bootspec, or something compatible with cross-arch
} }
) )
} $out/bin/ } $out
''; '';
}; };
vivarium.passwords = vivarium.passwords =

2
os/rebuild.sh
View file

@ -76,7 +76,7 @@ fi
if [ "$verb" = "test" ] || [ "$verb" = "switch" ] || [ "$confirm" = "y" ] if [ "$verb" = "test" ] || [ "$verb" = "switch" ] || [ "$confirm" = "y" ]
then then
info "Applying" info "Applying"
"$toplevel/bin/update-password-store" "$toplevel/update-password-store"
sudo nixos-rebuild --flake "$self#$HOSTNAME" test "${specialisationArgs[@]}" "$@" sudo nixos-rebuild --flake "$self#$HOSTNAME" test "${specialisationArgs[@]}" "$@"
fi fi