diff --git a/flake.lock b/flake.lock index 79379a3..ed2f103 100644 --- a/flake.lock +++ b/flake.lock @@ -45,16 +45,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", + "lastModified": 1771574726, + "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", + "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f787598..9fc0b1a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Stationette nix config"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -36,13 +36,13 @@ stationette = nixpkgs.lib.nixosSystem { modules = [ ./system/configuration.nix - home-manager.nixosModules.home-manager { - home-manager.users.chris = import ./home; - home-manager.extraSpecialArgs = { - inherit pkgs-unstable; - inherit inputs; - }; - } + home-manager.nixosModules.home-manager { + home-manager.users.chris = import ./home; + home-manager.extraSpecialArgs = { + inherit pkgs-unstable; + inherit inputs; + }; + } ]; }; }; diff --git a/home/user/default.nix b/home/user/default.nix index d9e2931..123d8ff 100644 --- a/home/user/default.nix +++ b/home/user/default.nix @@ -14,6 +14,7 @@ permittedInsecurePackages = [ "electron-25.9.0" # Obsidian + "beekeeper-studio-5.3.4" ]; }; }; diff --git a/home/user/packages.nix b/home/user/packages.nix index a3aef86..49fcf4e 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -17,28 +17,27 @@ obsidian thunderbird libreoffice-qt - nerd-fonts.fira-code + # pkgs-unstable.nerd-fonts.fira-code hunspell blueberry steam steam-run - yuzu-mainline viewnior pkgs-unstable.hyprshot catppuccin-cursors.macchiatoBlue catppuccin-gtk papirus-folders - php84Packages.composer - php84Packages.xdebug - php84Extensions.sqlite3 - php84Extensions.redis - php84Extensions.sodium - php84Extensions.pgsql - php84Extensions.iconv - php84Extensions.gd - php84Extensions.zip + # pkgs-unstable.php84Packages.composer + # pkgs-unstable.php84Packages.xdebug + # pkgs-unstable.php84Extensions.sqlite3 + # pkgs-unstable.php84Extensions.redis + # pkgs-unstable.php84Extensions.sodium + # pkgs-unstable.php84Extensions.pgsql + # pkgs-unstable.php84Extensions.iconv + # pkgs-unstable.php84Extensions.gd + # pkgs-unstable.php84Extensions.zip php - antigravity + # antigravity gimp kdePackages.dolphin enpass @@ -57,7 +56,6 @@ zathura ghostty wally-cli - youtube-dl kdePackages.wacomtablet kdePackages.print-manager mpv diff --git a/home/user/programs.nix b/home/user/programs.nix index 88db7a4..beefbe0 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ pkgs, inputs, ... }: let lock-false = { @@ -69,62 +69,62 @@ in }; }; }; - }; - /* ---- PROFILES ---- */ - # Switch profiles via about:profiles page. - # For options that are available in Home-Manager see - # https://nix-community.github.io/home-manager/options.html#opt-programs.firefox.profiles - profiles ={ - chris = { # choose a profile name; directory is /home//.mozilla/firefox/chris - id = 0; # 0 is the default profile; see also option "isDefault" - name = "chris"; # name as listed in about:profiles - isDefault = true; # can be omitted; true if profile ID is 0 - settings = { # specify profile-specific preferences here; check about:config for options - "browser.startup.homepage" = "https://tower.scarif.space"; - # "browser.newtabpage.pinned" = [{ - # title = "NixOS"; - # url = "https://nixos.org"; - # }]; - }; - search = { - force = true; - default = "holocron"; - engines = { - holocron = { - name = "Holocron"; - urls = [{ - template = "https://holocron.scarif.space/search"; - params = [ - { name = "q"; value = "{searchTerms}"; } - ]; - }]; - iconUpdateURL = "https://holocron.scarif.space/static/themes/simple/img/favicon.png"; - definedAliases = [ "@h" ]; # Allows you to type '@s query' in the URL bar + /* ---- PROFILES ---- */ + # Switch profiles via about:profiles page. + # For options that are available in Home-Manager see + # https://nix-community.github.io/home-manager/options.html#opt-programs.firefox.profiles + profiles ={ + chris = { # choose a profile name; directory is /home//.mozilla/firefox/chris + id = 0; # 0 is the default profile; see also option "isDefault" + name = "chris"; # name as listed in about:profiles + isDefault = true; # can be omitted; true if profile ID is 0 + settings = { # specify profile-specific preferences here; check about:config for options + "browser.startup.homepage" = "https://tower.scarif.space"; + # "browser.newtabpage.pinned" = [{ + # title = "NixOS"; + # url = "https://nixos.org"; + # }]; + }; + search = { + force = true; + default = "holocron"; + engines = { + holocron = { + name = "Holocron"; + urls = [{ + template = "https://holocron.scarif.space/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + iconUpdateURL = "https://holocron.scarif.space/static/themes/simple/img/favicon.png"; + definedAliases = [ "@h" ]; # Allows you to type '@s query' in the URL bar + }; + nix-packages = { + name = "Nix Packages"; + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + + nixos-wiki = { + name = "NixOS Wiki"; + urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }]; + iconMapObj."16" = "https://wiki.nixos.org/favicon.ico"; + definedAliases = [ "@nw" ]; + }; + + bing.metaData.hidden = true; + google.metaData.alias = "@g"; # builtin engines only support specifying one additional alias }; - nix-packages = { - name = "Nix Packages"; - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - - nixos-wiki = { - name = "NixOS Wiki"; - urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }]; - iconMapObj."16" = "https://wiki.nixos.org/favicon.ico"; - definedAliases = [ "@nw" ]; - }; - - bing.metaData.hidden = true; - google.metaData.alias = "@g"; # builtin engines only support specifying one additional alias }; }; }; diff --git a/system/modules/hardware.nix b/system/modules/hardware.nix index 5a69371..ad4f16e 100644 --- a/system/modules/hardware.nix +++ b/system/modules/hardware.nix @@ -5,7 +5,6 @@ bluetooth.enable = true; opengl = { enable = true; - driSupport = true; driSupport32Bit = true; }; }; diff --git a/system/modules/polkit.nix b/system/modules/polkit.nix index 506921e..f7bfa24 100644 --- a/system/modules/polkit.nix +++ b/system/modules/polkit.nix @@ -9,15 +9,15 @@ after = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; }; }; - extraConfig = '' - DefaulTimeoutStopSec=10s - ''; + # extraConfig = '' + # DefaulTimeoutStopSec=10s + # ''; }; environment.systemPackages = with pkgs; [ diff --git a/system/modules/sound.nix b/system/modules/sound.nix index 1d9b50a..5d29626 100644 --- a/system/modules/sound.nix +++ b/system/modules/sound.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - sound.enable = true; + # sound.enable = true; security.rtkit.enable = true; hardware.pulseaudio.enable = false; diff --git a/system/modules/virtualisation.nix b/system/modules/virtualisation.nix index 7efa682..9982926 100644 --- a/system/modules/virtualisation.nix +++ b/system/modules/virtualisation.nix @@ -9,8 +9,6 @@ qemu = { swtpm.enable = true; - ovmf.enable = true; - # ovmf.packages = [ pkgs.OVMFFULL.fd ]; }; };