]
},
"locked": {
- "lastModified": 1715381426,
- "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+ "lastModified": 1716736833,
+ "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+ "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.11",
+ "ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1712310679,
- "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
+ "lastModified": 1716793392,
+ "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "72da83d9515b43550436891f538ff41d68eecc7f",
+ "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.11",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
doom-emacs.flake = false;
doom-emacs.url = "github:hlissner/doom-emacs";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- home-manager.url = "github:nix-community/home-manager/release-23.11";
+ home-manager.url = "github:nix-community/home-manager/release-24.05";
nix-formatter-pack.inputs.nixpkgs.follows = "nixpkgs";
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
git-hooks.inputs.nixpkgs.follows = "nixpkgs";
git-hooks.inputs.nixpkgs-stable.follows = "nixpkgs";
git-hooks.url = "github:cachix/git-hooks.nix";
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
- pinentryFlavor = lib.mkDefault (if nixosConfig.services.xserver.enable then "gtk2" else "curses");
- #pinentryPackage = lib.mkDefault (if nixosConfig.services.xserver.enable then pkgs.pinentry-gtk2 else pkgs.pinentry-curses);
+ pinentryPackage = lib.mkDefault (if nixosConfig.services.xserver.enable then pkgs.pinentry-gtk2 else pkgs.pinentry-curses);
};
programs.gpg.enable = true;
programs.gpg.settings = {
home.packages = [
pkgs.croc
pkgs.sshfs
- pkgs.stig
+ #pkgs.stig
#pkgs.transmission-gtk
] ++ lib.optionals nixosConfig.services.xserver.enable [
pkgs.amule
../../../home-manager/profiles/firefox.nix
../../../home-manager/profiles/xmonad.nix
];
- services.gpg-agent.pinentryFlavor = lib.mkForce "curses";
- #services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-curses;
+ services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-curses;
home.packages = [
pkgs.evince
pkgs.wine
- pkgs.stig
+ #pkgs.stig
#pkgs.blender
#pkgs.freecad
#pkgs.mastodon-archive
pkgs.neverball
pkgs.tuxpaint
pkgs.xsane
- pkgs.stig
+ #pkgs.stig
pkgs.gthumb
pkgs.thunderbird
#pkgs.chromium
services.avahi = {
enable = true;
openFirewall = true;
- nssmdns = true;
+ nssmdns4 = true;
publish = {
enable = true;
addresses = true;
desktopManager = {
gnome.enable = true;
};
- displayManager = {
- defaultSession = "gnome";
- gdm.enable = true;
- autoLogin = {
- user = config.users.users.mo.name;
- };
+ };
+
+ services.displayManager = {
+ defaultSession = "gnome";
+ gdm.enable = true;
+ autoLogin = {
+ user = config.users.users.mo.name;
};
};
}
];
};
- displayManager = {
- defaultSession = "home-manager";
- #defaultSession = "none+xmonad";
- #defaultSession = "mate";
- #defaultSession = "cinnamon";
- autoLogin = {
- user = config.users.users.julm.name;
- };
+ };
+
+ services.displayManager = {
+ defaultSession = "home-manager";
+ #defaultSession = "none+xmonad";
+ #defaultSession = "mate";
+ #defaultSession = "cinnamon";
+ autoLogin = {
+ user = config.users.users.julm.name;
};
};
xfce.enable = true;
xterm.enable = false;
};
- displayManager = {
- defaultSession = "mate";
- autoLogin = {
- user = config.users.users.sevy.name;
- };
+ };
+
+ services.displayManager = {
+ defaultSession = "mate";
+ autoLogin = {
+ user = config.users.users.sevy.name;
};
};
services.gvfs.enable = mkDefault true;
services.avahi.enable = mkDefault true;
+ services.libinput.enable = mkDefault true;
services.xserver = {
enable = mkDefault true;
- libinput.enable = mkDefault true;
exportConfiguration = mkDefault true; # link /usr/share/X11/ properly
desktopManager = {
session = [
];
xterm.enable = mkDefault false;
};
- displayManager.autoLogin.enable = mkDefault true;
+ };
+
+ services.displayManager = {
+ autoLogin.enable = mkDefault true;
};
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
console.font = "Lat2-Terminus16";
console.keyMap = lib.mkDefault "fr";
services.xserver = {
- layout = lib.mkDefault "fr";
- xkbOptions = "eurosign:e, compose:menu, grp:alt_space_toggle";
+ xkb = {
+ layout = lib.mkDefault "fr";
+ options = "eurosign:e, compose:menu, grp:alt_space_toggle";
+ };
libinput.enable = config.services.xserver.enable;
};
}
# sets this up as soon as the initrd.
boot.kernelParams = [ "panic=10" ];
- programs.gnupg.agent.pinentryFlavor = "curses";
- #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
+ programs.gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
systemd = {
# Always try to start all the units (default.target)
../../home-manager/options.nix
../../home-manager/profiles/essential.nix
];
- services.gpg-agent.pinentryFlavor = "curses";
- #services.gpg-agent.pinentryPackage = pkgs.pinentry-curses;
+ services.gpg-agent.pinentryPackage = pkgs.pinentry-curses;
};
nix = {
settings.auto-optimise-store = mkDefault true;
enable = mkDefault true;
enableRootSlice = mkDefault true;
enableSystemSlice = mkDefault true;
- enableUserServices = mkDefault true;
+ enableUserSlices = mkDefault true;
};
systemd.services.openssh = {
serviceConfig = {
boot.zfs.forceImportRoot = true;
boot.zfs.requestEncryptionCredentials = lib.mkDefault [ "${hostName}/root" ];
- boot.zfs.enableUnstable = false;
+ #boot.zfs.package = pkgs.zfs_unstable;
# Enables periodic scrubbing of ZFS pools.
services.zfs.autoScrub.enable = true;
{
meta.description = "openvpn";
url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
- sha256 = "sha256-RWEVclcCLgb+Xna2G6BmtjEltH8IOE8diN+CnPhcJ+E=";
- }
- {
- meta.description = "stig";
- url = "https://github.com/NixOS/nixpkgs/pull/276014.diff";
- sha256 = "sha256-SUftUE++06TqRmK88VxQKiI9NaJs7XtC8I97ScQHF/Y=";
- }
- {
- meta.description = "dnscrypt-proxy2";
- url = "https://github.com/NixOS/nixpkgs/pull/304810.diff";
- sha256 = "sha256-YGQZibCIKz7YYS1bw2QNtHbJPWWV6nZqWwddWsAFK5Q=";
- }
- {
- meta.description = "kernel-hardening-checker";
- url = "https://github.com/NixOS/nixpkgs/pull/287537.diff";
- sha256 = "sha256-0Dos8UlxTQXhdMoKoMFDUMsI5PlgHzCsXsvFSvAvW5Q=";
+ sha256 = "sha256-mfSsvQagvR+9ykppFs4CYG6RLJJRcklZ61D/tZ4OErY=";
}
/*
{