diff --git a/flake.lock b/flake.lock index 3350a65..14619d3 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1747604854, - "narHash": "sha256-hV6LbeBnXYlxaJ1t/CZQUM0U16mAT4F0WrvuxObJwDo=", + "lastModified": 1747867343, + "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "c975050923763f4239a6f8a3a1c76125346b95f8", + "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1747621015, - "narHash": "sha256-j0fo1rNxZvmFLMaE945UrbLJZAHTlQmq0/QMgOP4GTs=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1747279714, - "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1747673685, - "narHash": "sha256-Vm/QsaY6A7aWZm/GdBKMbipNCHnC2hOFca/qCkcS+X4=", + "lastModified": 1748296380, + "narHash": "sha256-1QJCz5NzR/KLRpvk8aIUkfPV6ONwmtEdfIrHI26CPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "158d441ea06cf9d8fbf43d25a40c8d763b64329e", + "rev": "8c00e8f75283bf91e5bfb2939ab9aa876e2cf461", "type": "github" }, "original": { @@ -578,27 +578,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -610,11 +610,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -624,22 +624,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_2", @@ -647,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747673303, - "narHash": "sha256-wKPsF+3F+x1I4+d0wtEtQWXergQEZrDuDjz1+3xEoTg=", + "lastModified": 1748298368, + "narHash": "sha256-Scj64M2Osd26kGMjwgZjw7q+0tc7yhIJrh8Fw9tZ+RU=", "owner": "nix-community", "repo": "NUR", - "rev": "bb3f45787da23f99329ca618e1847dd7e192d6c5", + "rev": "d284a1082be198da8fc5b1a5c0d84881974d9821", "type": "github" }, "original": { @@ -698,11 +682,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747525582, - "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", + "lastModified": 1748298067, + "narHash": "sha256-vBwOZ4wwy30Qbik6dPP4m/k+g3z6R2eL26vhPi4tKzA=", "owner": "notashelf", "repo": "nvf", - "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", + "rev": "b45f0516a12202c602e080debef926be8a0ebab6", "type": "github" }, "original": { @@ -851,7 +835,9 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur_2", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -861,15 +847,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747673601, - "narHash": "sha256-jVs4byXRcqLpOTsr1MC5XwVyPhasswY2uc+Jkf5Fgmo=", - "owner": "danth", + "lastModified": 1748276618, + "narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=", + "owner": "nix-community", "repo": "stylix", - "rev": "2e58606c9c14d943783b5c0a8097f6f9712db3ee", + "rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 27daa98..6688b8d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "main system and home configuration flake"; inputs = { - # NixOS official package source, using the nixos-24.11 branch as stable and nixos-unstable as default - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + # NixOS official package source, using the nixos-25.05 branch as stable and nixos-unstable as default + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; @@ -14,6 +14,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # Automatic themeing (using home-manager module) + stylix = { + url = "github:nix-community/stylix/"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Declarative flatpak management, documentation states overriding nixpkgs is not supported nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; @@ -42,8 +48,6 @@ url = "github:nekowinston/satisfactory-server-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Automatic themeing (using home-manager module) - stylix.url = "github:danth/stylix"; musnix.url = "github:musnix/musnix"; }; @@ -145,7 +149,7 @@ modules = [ ./home-manager/home.nix inputs.nvf.homeManagerModules.default - inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine + inputs.stylix.homeModules.stylix inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 76cafe2..7483e70 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,8 +1,6 @@ { - config, pkgs, lib, - inputs, ... }: { home.username = "blue"; @@ -24,11 +22,9 @@ ./zellij.nix ]; - # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed home.stateVersion = "24.05"; - # services.pass-secret-service.enable = true; # for use with protonmail-bridge - services.gnome-keyring.enable = true; # used for protonmail-bridge and nextcloud-client + services.gnome-keyring.enable = true; # used for nextcloud-client # General use home packages that dont require a separate module home.packages = with pkgs; [ @@ -45,12 +41,19 @@ reaper # Paid DAW, using free trial telegram-desktop # Telegram messenger client pavucontrol # Useful audio control GUI - stable.prismlauncher + stable.prismlauncher # Minecraft launcher + virt-manager # QEMU manager + + # Audio Plugins calf zam-plugins lsp-plugins - ardour - gimp3 + + ardour # DAW + gimp3 # GNU Image Manipulation Program, pretty self explanatory + + networkmanagerapplet # Tray icon for managing networking + blueman # Tray icon for managing bluetooth ]; services.flatpak.packages = [ "io.mrarm.mcpelauncher" # Minecraft bedrock edition launcher @@ -71,6 +74,10 @@ programs.home-manager.enable = true; programs.tmux.enable = true; + programs.zoxide = { + enable = true; + enableZshIntegration = true; + }; programs.btop.enable = true; programs.btop.package = pkgs.stable.btop-rocm; @@ -86,33 +93,6 @@ lines = 3; columns = 200; }; - # font.normal = { - # family = "hack"; - # }; - # keyboard.bindings = [ - # { - # key = "K"; - # mods = "Control"; - # chars = "\\u000c"; - # } - # ]; }; }; - - # programs.hyprpaper = { - # enable = true; - # settings = { - # ipc = "on"; - # splash = false; - # splash_offset = 2.0; - - # preload = [ "~/Pictures/wallpaper.png" ]; - - # wallpaper = [ - # ",~/Pictures/wallpaper.png" - # ]; - # }; - # }; - - services.blueman-applet.enable = true; } diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 534709e..b5392ea 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -50,6 +50,10 @@ "[workspace name:bg_noise] floorp https://www.youtube.com/playlist?list=WL" "[workspace name:main] alacritty" + + "nm-applet --indicator" + "blueman-applet" + "trayscale" ]; # Declare all keybinds diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index ba5b52c..31d6410 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -22,7 +22,6 @@ }; globals.mapleader = " "; languages = { - enableLSP = true; enableDAP = true; enableExtraDiagnostics = true; enableFormat = true; diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 9f3e000..5485107 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, ... }: @@ -16,8 +14,9 @@ ls = "eza -lh"; ip = "ip --color=auto"; nano = "nvim"; + cd = "z"; - # Aliases for my nixos workflow, requires nh and home-manager + # Aliases for my nixos workflow switch = "sudo nixos-rebuild switch --flake ~/nixconf |& nom"; homeswitch = "home-manager switch --flake ~/nixconf |& nom"; serverswitch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo |& nom"; diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index d953055..d348d8c 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). { lib, pkgs, @@ -98,7 +95,7 @@ # Enable sound with pipewire. security.rtkit.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; @@ -166,6 +163,9 @@ # Enable flatpak for nix-flatpak used in home-manager services.flatpak.enable = true; + # Required for QEMU + systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ]; + # Enable qmk for managing framework laptop keyboards hardware.keyboard.qmk.enable = true; diff --git a/modules/packages.nix b/modules/packages.nix index a3e234a..bd3882c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -40,5 +40,6 @@ libreoffice nixfmt-rfc-style nixd + qemu ]; }