From 6f67e5f451c8589a018a4d4b6c3cf24575351c38 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 26 Mar 2026 14:30:47 +0000 Subject: [PATCH] fixes --- flake.lock | 294 ++---------------- flake.nix | 13 - home/arrakis/default.nix | 7 - home/common/programs/default.nix | 4 +- home/common/programs/desktop/default.nix | 1 - home/common/programs/dev.nix | 2 +- home/common/programs/ethui.nix | 4 +- home/common/programs/gpg.nix | 2 +- home/common/programs/hyprland/cursor.nix | 9 +- home/common/programs/hyprland/default.nix | 23 +- .../programs/hyprland/noctalia/default.nix | 4 +- home/common/programs/hyprland/rofi.nix | 7 - home/common/programs/hyprland/waybar.nix | 173 ----------- home/common/programs/kitty/default.nix | 1 - home/common/programs/nerd-dictation.nix | 3 - home/common/programs/rust.nix | 13 - home/common/programs/zen-browser.nix | 2 +- home/desktop/default.nix | 13 +- hosts/arrakis/default.nix | 43 +-- hosts/common/features/docker.nix | 5 +- hosts/common/features/networking.nix | 5 +- hosts/common/features/nix-ld.nix | 3 +- hosts/common/features/user.nix | 35 +++ hosts/common/global/default.nix | 7 - hosts/desktop/default.nix | 40 +-- 25 files changed, 93 insertions(+), 620 deletions(-) delete mode 100644 home/common/programs/hyprland/rofi.nix delete mode 100644 home/common/programs/hyprland/waybar.nix create mode 100644 hosts/common/features/user.nix diff --git a/flake.lock b/flake.lock index f1343f8..235d870 100644 --- a/flake.lock +++ b/flake.lock @@ -33,22 +33,6 @@ "type": "github" } }, - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, "claude-code": { "inputs": { "flake-utils": "flake-utils", @@ -105,27 +89,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -161,7 +124,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -411,36 +374,6 @@ "type": "github" } }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -501,7 +434,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1709914708, @@ -517,27 +450,6 @@ "type": "github" } }, - "hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1767871242, - "narHash": "sha256-Gge7LY1lrPc2knDnyw8GBQ2sxRPzM7W2T6jNG1HY5bA=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "bcd969224ffeb6266c6618c192949461135eef38", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -669,25 +581,6 @@ "type": "github" } }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "nix-colors", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1774273680, @@ -704,37 +597,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1752480373, @@ -814,22 +676,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1770380644, - "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -845,7 +691,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1773389992, "narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=", @@ -858,23 +704,19 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_7", - "systems": "systems_5" - }, + "nixpkgs_9": { "locked": { - "lastModified": 1774309640, - "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixvim", + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, @@ -905,7 +747,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -993,25 +835,20 @@ "hardware": "hardware", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", - "hyprspace": "hyprspace", - "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_6", - "nixvim": "nixvim", "noctalia": "noctalia", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "spicetify-nix": "spicetify-nix", - "systems": "systems_11", - "utils": "utils_3", + "systems": "systems_9", "zen-browser": "zen-browser" } }, "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "utils": "utils_2" }, "locked": { @@ -1048,8 +885,8 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", - "systems": "systems_10" + "nixpkgs": "nixpkgs_8", + "systems": "systems_8" }, "locked": { "lastModified": 1773619901, @@ -1080,51 +917,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_12": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1216,21 +1008,6 @@ } }, "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1245,6 +1022,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1287,7 +1079,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -1303,24 +1095,6 @@ "type": "github" } }, - "utils_3": { - "inputs": { - "systems": "systems_12" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1365,7 +1139,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1773737882, diff --git a/flake.nix b/flake.nix index e4e7271..0b8e695 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-colors.url = "github:misterio77/nix-colors"; - nixvim.url = "github:nix-community/nixvim"; nvchad4nix = { url = "github:nix-community/nix4nvchad"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,7 +27,6 @@ foundry = { url = "github:shazow/foundry.nix"; }; - utils.url = "github:numtide/flake-utils"; hardware.url = "github:NixOS/nixos-hardware/master"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; @@ -39,14 +36,6 @@ url = "https://github.com/hyprwm/Hyprland"; submodules = true; }; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - hyprspace = { - url = "github:KZDKM/Hyprspace"; - inputs.hyprland.follows = "hyprland"; - }; noctalia = { url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -61,7 +50,6 @@ systems, nixpkgs, home-manager, - utils, ... }@inputs: let @@ -79,7 +67,6 @@ ); x86 = pkgsFor.x86_64-linux; - aarch64 = pkgsFor.aarch64-linux; mkNixOS = name: diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index ef7ad7e..aa8556d 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -8,8 +8,6 @@ }: { imports = [ - inputs.nix-colors.homeManagerModule - inputs.nixvim.homeModules.nixvim ../common/programs/default.nix ../common/programs/desktop ../common/programs/zen-browser.nix @@ -49,9 +47,4 @@ programs.noctalia-shell.settings.bar = { density = "comfortable"; }; - - home = { - username = lib.mkDefault "naps62"; - stateVersion = lib.mkDefault "24.05"; - }; } diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index 9656fac..9dd61a6 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -24,7 +24,7 @@ ./ssh.nix ]; - home.mutableFilesRepoPath = "/home/naps62/projects/nixos-config"; + home.mutableFilesRepoPath = "${config.home.homeDirectory}/projects/nixos-config"; programs = { home-manager.enable = true; @@ -35,7 +35,9 @@ ]; home = { + username = lib.mkDefault "naps62"; homeDirectory = lib.mkDefault "/home/${config.home.username}"; + stateVersion = lib.mkDefault "24.05"; sessionPath = [ "$HOME/.local/bin" ]; }; } diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index 7da64b1..24cfdfd 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -43,7 +43,6 @@ signal-desktop # dev tools - ferdium yaak bun diff --git a/home/common/programs/dev.nix b/home/common/programs/dev.nix index 75d412a..a5687e5 100644 --- a/home/common/programs/dev.nix +++ b/home/common/programs/dev.nix @@ -39,7 +39,7 @@ ktlint croc opencode - amp-cli + process-compose # typst typst diff --git a/home/common/programs/ethui.nix b/home/common/programs/ethui.nix index 681dabf..d596ec7 100644 --- a/home/common/programs/ethui.nix +++ b/home/common/programs/ethui.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { - home.packages = [ inputs.ethui.packages.x86_64-linux.default ]; + home.packages = [ inputs.ethui.packages.${pkgs.stdenv.hostPlatform.system}.default ]; } diff --git a/home/common/programs/gpg.nix b/home/common/programs/gpg.nix index f855714..1041e1a 100644 --- a/home/common/programs/gpg.nix +++ b/home/common/programs/gpg.nix @@ -20,7 +20,7 @@ programs.password-store = { enable = true; settings = { - PASSWORD_STORE_DIR = "/home/naps62/sync/pass"; + PASSWORD_STORE_DIR = "${config.home.homeDirectory}/sync/pass"; }; }; } diff --git a/home/common/programs/hyprland/cursor.nix b/home/common/programs/hyprland/cursor.nix index c2a8503..f4b83df 100644 --- a/home/common/programs/hyprland/cursor.nix +++ b/home/common/programs/hyprland/cursor.nix @@ -15,12 +15,5 @@ in XCURSOR_SIZE = cursorSize; }; - dconf = { - enable = true; - # settings = { - # "org/gnome/desktop/interface" = { - # cursor-theme = "BreezeX-RosePine-Linux"; - # }; - # }; - }; + dconf.enable = true; } diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 9fc371d..2334289 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -6,7 +6,6 @@ ... }: let - rofiLaunchers = import ../../../pkgs/rofi-launchers/package.nix { }; cfg = config.custom.hyprland; in { @@ -24,9 +23,7 @@ in }; imports = [ - ./rofi.nix ./cursor.nix - ./waybar.nix ./noctalia ./wallpapers.nix ]; @@ -53,17 +50,9 @@ in enable = true; package = null; portalPackage = null; - plugins = [ - # inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprfocus - # inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace - ]; + plugins = [ ]; settings = { plugin = { - # hyprfocus = { - # enabled = true; - # mode = "flash"; - # flash_opacity = 0.8; # Flash brighter instead of dimmer - # }; overview = { autoDrag = true; exitOnClick = true; @@ -116,7 +105,6 @@ in decoration = { blur = { enabled = true; - # new_optimizations = false; popups = false; }; shadow = { @@ -219,21 +207,13 @@ in bind = [ "$mod, n, exec, noctalia-shell ipc call controlCenter toggle" - # "$mod, tab, overview:toggle," - "$mod, b, exec, pkill waybar || waybar" "$mod, t, exec, kitty" "$mod, v, togglefloating" "$mod, q, killactive" "$mod, f, fullscreen, 0" "$mod SHIFT, f, fullscreen, 1" - # app launcher "$mod, space, exec, noctalia-shell ipc call launcher toggle" - # rofi (old) - # "$mod, space, exec, launcher_t2" - - # nerd-dictation - # "$mod, d, exec, nerd-dictation-toggle" # printscreen ", Print, exec, hyprshot -m region --raw | satty --filename - --output-filename ~/downloads/screenshots/$(date +%Y-%m-%d_%H-%M-%S).png" @@ -249,7 +229,6 @@ in "$mod, 1, workspace, 1" "$mod, 2, workspace, 2" "$mod, 3, workspace, 3" - "$mod, 3, workspace, 3" "$mod, 4, workspace, 4" "$mod, 5, workspace, 5" "$mod, 6, workspace, 6" diff --git a/home/common/programs/hyprland/noctalia/default.nix b/home/common/programs/hyprland/noctalia/default.nix index 1f2c93f..a368cb8 100644 --- a/home/common/programs/hyprland/noctalia/default.nix +++ b/home/common/programs/hyprland/noctalia/default.nix @@ -292,7 +292,7 @@ in animationDisabled = false; animationSpeed = 1; autoStartAuth = true; - avatarImage = "/home/naps62/.face"; + avatarImage = "${config.home.homeDirectory}/.face"; boxRadiusRatio = 1; clockFormat = "hh\\nmm"; clockStyle = "custom"; @@ -563,7 +563,7 @@ in }; wallpaper = { automationEnabled = true; - directory = "/home/naps62/.cache/wallpapers/3840x2160"; + directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160"; enabled = true; favorites = [ ]; fillColor = "#5e81ac"; diff --git a/home/common/programs/hyprland/rofi.nix b/home/common/programs/hyprland/rofi.nix deleted file mode 100644 index c366280..0000000 --- a/home/common/programs/hyprland/rofi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - rofi - (callPackage ../../../../pkgs/rofi-launchers/package.nix { }) - ]; -} diff --git a/home/common/programs/hyprland/waybar.nix b/home/common/programs/hyprland/waybar.nix deleted file mode 100644 index abfca0c..0000000 --- a/home/common/programs/hyprland/waybar.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ pkgs, ... }: -{ - programs.waybar = { - enable = true; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 32; - exclusive = false; - - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ - "tray" - "bluetooth" - "network" - "pulseaudio" - "battery" - "clock" - ]; - - "hyprland/workspaces" = { - format = "{icon}"; - format-icons = { - "1" = "1"; - "2" = "2"; - "3" = "3"; - "4" = "4"; - "5" = "5"; - "6" = "6"; - }; - persistent-workspaces = { - "*" = [ 1 2 3 4 5 6 ]; - }; - }; - - "hyprland/window" = { - max-length = 50; - }; - - tray = { - icon-size = 16; - spacing = 8; - }; - - bluetooth = { - format = "󰂯"; - format-disabled = "󰂲"; - format-connected = "󰂱"; - tooltip-format = "{controller_alias}\t{controller_address}"; - tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{device_enumerate}"; - tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; - on-click = "blueman-manager"; - }; - - network = { - format-wifi = "󰤨"; - format-ethernet = "󰈀"; - format-disconnected = "󰤭"; - tooltip-format-wifi = "{essid} ({signalStrength}%)"; - tooltip-format-ethernet = "{ifname}: {ipaddr}/{cidr}"; - tooltip-format-disconnected = "Disconnected"; - }; - - pulseaudio = { - format = "{icon}"; - format-muted = "󰝟"; - format-icons = { - default = [ "󰕿" "󰖀" "󰕾" ]; - }; - tooltip-format = "{volume}%"; - on-click = "pavucontrol"; - on-click-right = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; - scroll-step = 5; - }; - - battery = { - format = "{icon} {capacity}%"; - format-charging = "󰂄 {capacity}%"; - format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; - states = { - warning = 20; - critical = 10; - }; - }; - - clock = { - format = "{:%H:%M}"; - tooltip-format = "{:%A, %B %d, %Y}"; - }; - }; - }; - - style = '' - @define-color foreground #bac2de; - @define-color background #11111b; - @define-color active #b4befe; - @define-color warning #f9e2af; - @define-color critical #f38ba8; - @define-color muted #6c7086; - - * { - background-color: transparent; - color: @foreground; - border: none; - border-radius: 0; - min-height: 0; - font-family: FiraCode Nerd Font; - font-size: 15px; - } - - window#waybar { - background-color: @background; - } - - .modules-left { - margin-left: 10px; - } - - .modules-right { - margin-right: 10px; - } - - #workspaces button { - padding: 0 6px; - margin: 0 2px; - color: @muted; - } - - #workspaces button.active { - color: @active; - } - - #workspaces button.urgent { - color: @critical; - } - - #window { - color: @muted; - font-size: 14px; - } - - #tray, - #bluetooth, - #network, - #pulseaudio, - #battery, - #clock { - padding: 0 10px; - color: @foreground; - } - - #battery.warning { - color: @warning; - } - - #battery.critical { - color: @critical; - } - - #pulseaudio.muted { - color: @muted; - } - - tooltip { - background-color: @background; - border: 1px solid @muted; - border-radius: 4px; - } - ''; - }; -} diff --git a/home/common/programs/kitty/default.nix b/home/common/programs/kitty/default.nix index c1cdde5..adea056 100644 --- a/home/common/programs/kitty/default.nix +++ b/home/common/programs/kitty/default.nix @@ -55,7 +55,6 @@ in tab_bar_edge = "bottom"; tab_bar_style = "powerline"; tab_powerline_style = "slanted"; - # tab_title_template = "{tab.active_wd.split('/')[-1]}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; tab_bar_filter = "session:~ or session:^$"; # keys diff --git a/home/common/programs/nerd-dictation.nix b/home/common/programs/nerd-dictation.nix index a7bbd7b..33f01e2 100644 --- a/home/common/programs/nerd-dictation.nix +++ b/home/common/programs/nerd-dictation.nix @@ -123,7 +123,4 @@ in nerd-dictation-toggle pkgs.ydotool ]; - - # Note: You may need to enable ydotoold as a systemd service - # Either via NixOS configuration or by running: ydotoold & } diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index 98ad098..e663467 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -21,21 +21,8 @@ [build] rustflags = ["-Z", "threads=12"] - - # [unstable] - # codegen-backend = true - # - # [profile.dev] - # codegen-backend = "cranelift" ''; - # systemd.user.services.ra-multiplex = { - # Service = { - # ExecStart = "${pkgs.ra-multiplex}/bin/ra-multiplex server"; - # }; - # Install.WantedBy = [ "default.target" ]; - # }; - home.sessionVariables = { OPENSSL_DIR = "${pkgs.openssl.dev}"; OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; diff --git a/home/common/programs/zen-browser.nix b/home/common/programs/zen-browser.nix index c71cacf..202abce 100644 --- a/home/common/programs/zen-browser.nix +++ b/home/common/programs/zen-browser.nix @@ -1,4 +1,4 @@ { inputs, pkgs, ... }: { - home.packages = [ inputs.zen-browser.packages.x86_64-linux.twilight-official ]; + home.packages = [ inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.twilight-official ]; } diff --git a/home/desktop/default.nix b/home/desktop/default.nix index ced8181..5c240bd 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -8,8 +8,6 @@ }: { imports = [ - inputs.nix-colors.homeManagerModule - inputs.nixvim.homeModules.nixvim ../common/programs/default.nix ../common/programs/desktop ../common/programs/zen-browser.nix @@ -89,17 +87,12 @@ wallpaper = { enableMultiMonitorDirectories = true; monitorDirectories = [ - { monitor = "HDMI-A-1"; directory = "/home/naps62/.cache/wallpapers/3840x2160"; } - { monitor = "DP-1"; directory = "/home/naps62/.cache/wallpapers/3840x2160"; } - { monitor = "DP-2"; directory = "/home/naps62/.cache/wallpapers/2160x3840"; } + { monitor = "HDMI-A-1"; directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160"; } + { monitor = "DP-1"; directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160"; } + { monitor = "DP-2"; directory = "${config.home.homeDirectory}/.cache/wallpapers/2160x3840"; } ]; }; }; programs.kitty.settings.font_size = 16; - - home = { - username = lib.mkDefault "naps62"; - stateVersion = lib.mkDefault "24.05"; - }; } diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 8eedc48..d133019 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -9,6 +9,7 @@ inputs.hardware.nixosModules.dell-xps-13-9315 ./hardware-configuration.nix ../common/global + ../common/features/user.nix ../common/features/laptop.nix ../common/features/networking.nix ../common/features/gpu/intel-graphics.nix @@ -26,44 +27,10 @@ networking.hostName = "arrakis"; - boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - kernelParams = [ - "i915=force_probe=46a6" - "i915.enable_psr=0" - ]; - }; - - system.stateVersion = "24.05"; - - programs.zsh.enable = true; - - users.users.naps62 = { - isNormalUser = true; - description = "Miguel Palhas"; - extraGroups = [ - "networkmanager" - "input" - "wheel" - "docker" - "dialout" - "adbusers" - "kvm" - ]; - shell = pkgs.zsh; - initialHashedPassword = "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D"; - openssh.authorizedKeys.keys = - let - authorizedKeys = pkgs.fetchurl { - url = "https://github.com/naps62.keys"; - sha256 = "sha256-KNei7flY0a+dIHdJjeU1+MQGAZRoz8RJnNS75svDIBY="; - }; - in - pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); - }; + boot.kernelParams = [ + "i915=force_probe=46a6" + "i915.enable_psr=0" + ]; hardware.ipu6 = { enable = true; diff --git a/hosts/common/features/docker.nix b/hosts/common/features/docker.nix index 8017322..7cdf2c9 100644 --- a/hosts/common/features/docker.nix +++ b/hosts/common/features/docker.nix @@ -10,8 +10,5 @@ users.groups.docker = { }; - networking.firewall = { - enable = false; - # checkReversePath = false; - }; + networking.firewall.enable = false; } diff --git a/hosts/common/features/networking.nix b/hosts/common/features/networking.nix index 76c09b5..b2773ad 100644 --- a/hosts/common/features/networking.nix +++ b/hosts/common/features/networking.nix @@ -1,10 +1,7 @@ { inputs, pkgs, ... }: { networking = { - networkmanager = { - enable = true; - }; - # wireless.iwd.enable = true; + networkmanager.enable = true; }; services.avahi = { diff --git a/hosts/common/features/nix-ld.nix b/hosts/common/features/nix-ld.nix index f68f62a..817c154 100644 --- a/hosts/common/features/nix-ld.nix +++ b/hosts/common/features/nix-ld.nix @@ -2,7 +2,6 @@ { programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ - # Add any missing dynamic libraries for unpackaged programs - # here, NOT in environment.systemPackages + stdenv.cc.cc.lib ]; } diff --git a/hosts/common/features/user.nix b/hosts/common/features/user.nix new file mode 100644 index 0000000..6cfe339 --- /dev/null +++ b/hosts/common/features/user.nix @@ -0,0 +1,35 @@ +{ pkgs, ... }: +{ + programs.zsh.enable = true; + + users.users.naps62 = { + isNormalUser = true; + description = "Miguel Palhas"; + extraGroups = [ + "networkmanager" + "input" + "wheel" + "docker" + "dialout" + "adbusers" + "kvm" + ]; + shell = pkgs.zsh; + initialHashedPassword = "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D"; + openssh.authorizedKeys.keys = + let + authorizedKeys = pkgs.fetchurl { + url = "https://github.com/naps62.keys"; + sha256 = "sha256-KNei7flY0a+dIHdJjeU1+MQGAZRoz8RJnNS75svDIBY="; + }; + in + pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); + }; + + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + + system.stateVersion = "24.05"; +} diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index de0c2a0..c82babb 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -12,13 +12,6 @@ gnumake ]; - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - stdenv.cc.cc.lib - ]; - }; - time = { timeZone = "Europe/Lisbon"; }; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index efab542..a679039 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -8,6 +8,7 @@ imports = [ ./hardware-configuration.nix ../common/global + ../common/features/user.nix ../common/features/networking.nix ../common/features/gpu/nvidia.nix ../common/features/display @@ -24,21 +25,6 @@ networking.hostName = "konishi"; - boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - - # kernel.sysctl = { - # "net.ipv6.conf.all.disable_ipv6" = 1; - # }; - }; - - system.stateVersion = "24.05"; - - programs.zsh.enable = true; - services.xserver.displayManager.sessionCommands = '' BOTTOM='HDMI-0' TOP='DP-0' @@ -52,30 +38,6 @@ ${pkgs.xrandr}/bin/xrandr --dpi 160 ''; - users.users.naps62 = { - isNormalUser = true; - description = "Miguel Palhas"; - extraGroups = [ - "networkmanager" - "input" - "wheel" - "docker" - "dialout" - "adbusers" - "kvm" - ]; - shell = pkgs.zsh; - initialHashedPassword = "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D"; - openssh.authorizedKeys.keys = - let - authorizedKeys = pkgs.fetchurl { - url = "https://github.com/naps62.keys"; - sha256 = "sha256-KNei7flY0a+dIHdJjeU1+MQGAZRoz8RJnNS75svDIBY="; - }; - in - pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); - }; - networking.nameservers = [ "100.100.100.100" "10.1.10.1"