diff --git a/nixos/flake.lock b/nixos/flake.lock index 36ddf9c..f002d94 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -2,17 +2,17 @@ "nodes": { "devshell": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", + "lastModified": 1705332421, + "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", "owner": "numtide", "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", + "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", "type": "github" }, "original": { @@ -22,15 +22,33 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -46,58 +64,79 @@ ] }, "locked": { - "lastModified": 1699748081, - "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "04bac349d585c9df38d78e0285b780a140dc74a4", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701208414, + "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "type": "indirect" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1699756042, - "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", + "lastModified": 1708210246, + "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", + "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -106,13 +145,79 @@ "type": "indirect" } }, + "openconnect-sso": { + "inputs": { + "flake-utils": [ + "utils" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1701455376, + "narHash": "sha256-FMLrMdi6JY7ZfqV5XnNj64jnDcGKznKZLn7O6OMO3u0=", + "owner": "ThinkChaos", + "repo": "openconnect-sso", + "rev": "20c0015c4264c72cc19ac272de0dc534309bd21b", + "type": "github" + }, + "original": { + "owner": "ThinkChaos", + "ref": "fix/nix-flake", + "repo": "openconnect-sso", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "openconnect-sso", + "flake-utils" + ], + "nix-github-actions": [ + "openconnect-sso", + "nix-github-actions" + ], + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ], + "systems": [ + "openconnect-sso", + "systems" + ], + "treefmt-nix": [ + "openconnect-sso", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1701105783, + "narHash": "sha256-5IOI0xXGbhAkUZNNcPId48V78Q+/JlW0hzlif0zxRmM=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "0b2bff39e9bd4e6db3208e09c276ca83a063b370", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "root": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "openconnect-sso": "openconnect-sso", "sops-nix": "sops-nix", "utils": "utils" } @@ -125,11 +230,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699951338, - "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", + "lastModified": 1708225343, + "narHash": "sha256-Q0uVUOfumc1DcKsIJIfMCHph08MjkOvZxvPb/Vi8hWw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", + "rev": "ffed177a9d2c685901781c3c6c9024ae0ffc252b", "type": "github" }, "original": { @@ -168,6 +273,42 @@ "type": "github" } }, + "systems_3": { + "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": { + "inputs": { + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "flake-utils": [ diff --git a/nixos/flake.nix b/nixos/flake.nix index b2dda58..e5a93b8 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,7 +2,7 @@ description = "System configuration of my machines using flakes"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.05"; + nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; devshell = { @@ -11,7 +11,7 @@ }; flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; openconnect-sso = { @@ -40,8 +40,7 @@ unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "corefonts" - "nvidia-settings" "nvidia-x11" - "obsidian" + "nvidia-settings" "nvidia-x11" "nvidia-persistenced" "Oracle_VM_VirtualBox_Extension_Pack" "spotify" "steam" "steam-original" "steam-run" diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix index be82054..4d207b3 100644 --- a/nixos/hosts/Tibo-NixDesk/default.nix +++ b/nixos/hosts/Tibo-NixDesk/default.nix @@ -6,9 +6,12 @@ ]; sisyphus = { + desktop.gnome.enable = true; + hardware.nvidia = { enable = true; model = "RTX 2060"; + gui-settings = true; }; networking = { @@ -36,12 +39,13 @@ users.tdpeuter.enable = true; - virtualisation.virtualbox.enable = true; + virtualisation = { + docker.enable = true; + virtualbox.enable = true; + }; }; boot = { - kernelPackages = pkgs.linuxPackages_hardened; - loader = { systemd-boot.enable = true; efi = { @@ -66,13 +70,14 @@ hardware.bluetooth.enable = true; - networking = { - hostName = "Tibo-NixDesk"; - networkmanager.enable = true; - # wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.hostName = "Tibo-NixDesk"; + + services.xserver = { + layout = "us"; + xkbVariant = "altgr-intl"; }; - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; time.timeZone = "Europe/Brussels"; diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix index 1900b2d..a63da41 100644 --- a/nixos/users/tdpeuter/default.nix +++ b/nixos/users/tdpeuter/default.nix @@ -35,7 +35,7 @@ in { shell = pkgs.zsh; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ corefonts # Calibri for Uni font-awesome # Dependency of Vifm & zsh config letter # Personal font @@ -45,7 +45,6 @@ in { ]; sisyphus = { - desktop.sway.enable = true; programs.spotify-adblock.enable = true; }; @@ -57,8 +56,6 @@ in { homeDirectory = "/home/${user}"; inherit (config.system) stateVersion; - # If you specify an application here, it will be detected by the configuration module - # and the configuration files will be put in place for you. packages = (with pkgs; [ chafa # Terminal image viewer cmdtime # Zsh plugin @@ -71,7 +68,6 @@ in { libreoffice-fresh nextcloud-client nsxiv # Lightweight image viewer - oh-my-zsh phinger-cursors # Cursor theme qalculate-gtk # Calculator spotify-adblock @@ -87,8 +83,8 @@ in { # SMB cifs-utils psmisc ]) ++ (with pkgs-unstable; [ + brave mpv - obsidian spotify ]) ++ (with pkgs.vimPlugins; [ statix