diff --git a/nixos/flake.lock b/nixos/flake.lock index 0d2e100..5ea328e 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -25,16 +25,16 @@ ] }, "locked": { - "lastModified": 1764736872, - "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3366918730bb6b699395a9d237397f1d710a94b3", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -62,26 +62,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1763948260, + "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -163,7 +163,8 @@ "nixpkgs-unstable": "nixpkgs-unstable", "openconnect-sso": "openconnect-sso", "sops-nix": "sops-nix", - "utils": "utils" + "utils": "utils", + "zen-browser": "zen-browser" } }, "sops-nix": { @@ -173,11 +174,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { @@ -256,6 +257,26 @@ "repo": "flake-utils-plus", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764043759, + "narHash": "sha256-E2rAiWTdrjSAciWELleI/fHoryzfxvA+ujvqZy3u2QA=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "482827614f573a2ec9dc17c8401889e536f0e7c1", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/nixos/flake.nix b/nixos/flake.nix index c5ce42f..fa8b125 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,12 +2,12 @@ description = "System configuration of my machines using flakes"; inputs = { - nixpkgs.url = "nixpkgs/nixos-25.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; openconnect-sso = { @@ -25,11 +25,15 @@ url = "github:gytis-ivaskevicius/flake-utils-plus"; inputs.flake-utils.follows = "flake-utils"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, - flake-utils, home-manager, openconnect-sso, sops-nix, utils, + flake-utils, home-manager, openconnect-sso, sops-nix, utils, zen-browser, ... }: let system = utils.lib.system.x86_64-linux; @@ -43,7 +47,6 @@ "vista-fonts" "intel-ocl" "libfprint-2-tod1-broadcom" - "vmware-workstation" ]; in utils.lib.mkFlake { diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix index 7d977af..e689f5d 100644 --- a/nixos/hosts/Tibo-NixTop/default.nix +++ b/nixos/hosts/Tibo-NixTop/default.nix @@ -38,7 +38,6 @@ home-manager.enable = true; sops.enable = true; ssh.enable = true; - wireshark.enable = true; }; services = { @@ -114,17 +113,17 @@ }; }; - logind.settings.Login = { + logind = { # Handle the laptop lid switch as follows: - HandleLidSwitch = "hybrid-sleep"; - HandleLidSwitchExternalPower = "lock"; - HandleLidSwitchDocked = "ignore"; + lidSwitch = "hybrid-sleep"; + lidSwitchExternalPower = "lock"; + lidSwitchDocked = "ignore"; # Handle the power key - HandlePowerKey = "suspend"; - HandlePowerKeyLongPress = "poweroff"; + powerKey = "suspend"; }; + power-profiles-daemon.enable = false; smartd.enable = true; @@ -143,9 +142,9 @@ libinput.enable = true; }; - virtualisation.vmware.host.enable = true; - - networking.hostName = "Tibo-NixTop"; # Define your hostname. + networking = { + hostName = "Tibo-NixTop"; # Define your hostname. + }; # Set your time zone. time.timeZone = "Europe/Brussels"; @@ -162,6 +161,12 @@ useXkbConfig = true; # use xkb.options in tty. }; + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + # List packages installed in system profile. # You can use https://search.nixos.org/ to find more packages (and options). environment = { @@ -195,5 +200,6 @@ # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "25.05"; # Did you read the comment? + } diff --git a/nixos/modules/hardware/nvidia/default.nix b/nixos/modules/hardware/nvidia/default.nix index e9ae0d3..e98ed6d 100644 --- a/nixos/modules/hardware/nvidia/default.nix +++ b/nixos/modules/hardware/nvidia/default.nix @@ -41,8 +41,8 @@ in { extraPackages = with pkgs; [ intel-ocl intel-compute-runtime - intel-graphics-compiler opencl-clhpp + opencl-clang opencl-headers ocl-icd ]; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index 5f672a8..fd61ea8 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -5,6 +5,5 @@ ./sops ./spotify-adblock ./ssh - ./wireshark ]; } diff --git a/nixos/modules/programs/wireshark/default.nix b/nixos/modules/programs/wireshark/default.nix deleted file mode 100644 index 04945fe..0000000 --- a/nixos/modules/programs/wireshark/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.sisyphus.programs.wireshark; -in { - options.sisyphus.programs.wireshark.enable = lib.mkEnableOption "Wireshark"; - - config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - wireshark - ]; - - programs.wireshark = { - enable = true; - dumpcap.enable = true; - usbmon.enable = false; - }; - - sisyphus.users.wantedGroups = [ - "wireshark" - ]; - }; -} diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix index 1351a66..353a1d4 100644 --- a/nixos/users/tdpeuter/default.nix +++ b/nixos/users/tdpeuter/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, ... }: +{ config, inputs, lib, pkgs, pkgs-unstable, ... }: let cfg = config.sisyphus.users.tdpeuter; @@ -46,10 +46,9 @@ in { gh # GitHub CLI tool glow # Terminal Markdown renderer icosystem # Personal icon theme - #jellyfin-media-player + jellyfin-media-player libreoffice-fresh # Office tools librewolf # Internet browser - logseq # Note taking mpv # Media player nextcloud-client nsxiv # Lightweight image viewer @@ -74,7 +73,10 @@ in { # TODO Move to devshells # ruff pylint # Python ]) ++ (with pkgs-unstable; [ - ]); + logseq # Note taking + ]) ++ [ + inputs.zen-browser.packages.${pkgs.system}.default + ]; }; fonts.packages = with pkgs; [ @@ -85,8 +87,9 @@ in { noto-fonts # Dependency of Zellij config noto-fonts-cjk-sans # Dependency of Zellij config noto-fonts-cjk-serif # Dependency of Zellij config + noto-fonts-emoji noto-fonts-color-emoji # Emoji's! - vista-fonts # Microsoft fonts + vistafonts # Microsoft fonts ]; sisyphus = {