This commit is contained in:
Miguel Palhas
2026-03-26 14:30:47 +00:00
parent 6c397bc61a
commit 6f67e5f451
25 changed files with 93 additions and 620 deletions
Generated
+34 -260
View File
@@ -33,22 +33,6 @@
"type": "github" "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": { "claude-code": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@@ -105,27 +89,6 @@
"type": "github" "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": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@@ -161,7 +124,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -411,36 +374,6 @@
"type": "github" "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": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -501,7 +434,7 @@
"rose-pine-hyprcursor", "rose-pine-hyprcursor",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_8" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1709914708, "lastModified": 1709914708,
@@ -517,27 +450,6 @@
"type": "github" "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": { "hyprtoolkit": {
"inputs": { "inputs": {
"aquamarine": [ "aquamarine": [
@@ -669,25 +581,6 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1774273680, "lastModified": 1774273680,
@@ -704,37 +597,6 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1752480373, "lastModified": 1752480373,
@@ -814,22 +676,6 @@
} }
}, },
"nixpkgs_7": { "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": { "locked": {
"lastModified": 1710272261, "lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@@ -845,7 +691,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1773389992, "lastModified": 1773389992,
"narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=", "narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=",
@@ -858,23 +704,19 @@
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
} }
}, },
"nixvim": { "nixpkgs_9": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_7",
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1774309640, "lastModified": 1773389992,
"narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
"owner": "nix-community", "owner": "nixos",
"repo": "nixvim", "repo": "nixpkgs",
"rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nixos",
"repo": "nixvim", "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
@@ -905,7 +747,7 @@
"noctalia", "noctalia",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_6", "systems": "systems_4",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@@ -993,25 +835,20 @@
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
"hyprspace": "hyprspace",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixvim": "nixvim",
"noctalia": "noctalia", "noctalia": "noctalia",
"nvchad-starter": "nvchad-starter", "nvchad-starter": "nvchad-starter",
"nvchad4nix": "nvchad4nix", "nvchad4nix": "nvchad4nix",
"rose-pine-hyprcursor": "rose-pine-hyprcursor", "rose-pine-hyprcursor": "rose-pine-hyprcursor",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"systems": "systems_11", "systems": "systems_9",
"utils": "utils_3",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
"rose-pine-hyprcursor": { "rose-pine-hyprcursor": {
"inputs": { "inputs": {
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
@@ -1048,8 +885,8 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"systems": "systems_10" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1773619901, "lastModified": 1773619901,
@@ -1080,51 +917,6 @@
"type": "github" "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": { "systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@@ -1216,21 +1008,6 @@
} }
}, },
"systems_8": { "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": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1245,6 +1022,21 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -1287,7 +1079,7 @@
}, },
"utils_2": { "utils_2": {
"inputs": { "inputs": {
"systems": "systems_9" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@@ -1303,24 +1095,6 @@
"type": "github" "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": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
@@ -1365,7 +1139,7 @@
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1773737882, "lastModified": 1773737882,
-13
View File
@@ -15,8 +15,6 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-colors.url = "github:misterio77/nix-colors";
nixvim.url = "github:nix-community/nixvim";
nvchad4nix = { nvchad4nix = {
url = "github:nix-community/nix4nvchad"; url = "github:nix-community/nix4nvchad";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -29,7 +27,6 @@
foundry = { foundry = {
url = "github:shazow/foundry.nix"; url = "github:shazow/foundry.nix";
}; };
utils.url = "github:numtide/flake-utils";
hardware.url = "github:NixOS/nixos-hardware/master"; hardware.url = "github:NixOS/nixos-hardware/master";
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
@@ -39,14 +36,6 @@
url = "https://github.com/hyprwm/Hyprland"; url = "https://github.com/hyprwm/Hyprland";
submodules = true; submodules = true;
}; };
hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland";
};
hyprspace = {
url = "github:KZDKM/Hyprspace";
inputs.hyprland.follows = "hyprland";
};
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell"; url = "github:noctalia-dev/noctalia-shell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -61,7 +50,6 @@
systems, systems,
nixpkgs, nixpkgs,
home-manager, home-manager,
utils,
... ...
}@inputs: }@inputs:
let let
@@ -79,7 +67,6 @@
); );
x86 = pkgsFor.x86_64-linux; x86 = pkgsFor.x86_64-linux;
aarch64 = pkgsFor.aarch64-linux;
mkNixOS = mkNixOS =
name: name:
-7
View File
@@ -8,8 +8,6 @@
}: }:
{ {
imports = [ imports = [
inputs.nix-colors.homeManagerModule
inputs.nixvim.homeModules.nixvim
../common/programs/default.nix ../common/programs/default.nix
../common/programs/desktop ../common/programs/desktop
../common/programs/zen-browser.nix ../common/programs/zen-browser.nix
@@ -49,9 +47,4 @@
programs.noctalia-shell.settings.bar = { programs.noctalia-shell.settings.bar = {
density = "comfortable"; density = "comfortable";
}; };
home = {
username = lib.mkDefault "naps62";
stateVersion = lib.mkDefault "24.05";
};
} }
+3 -1
View File
@@ -24,7 +24,7 @@
./ssh.nix ./ssh.nix
]; ];
home.mutableFilesRepoPath = "/home/naps62/projects/nixos-config"; home.mutableFilesRepoPath = "${config.home.homeDirectory}/projects/nixos-config";
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@@ -35,7 +35,9 @@
]; ];
home = { home = {
username = lib.mkDefault "naps62";
homeDirectory = lib.mkDefault "/home/${config.home.username}"; homeDirectory = lib.mkDefault "/home/${config.home.username}";
stateVersion = lib.mkDefault "24.05";
sessionPath = [ "$HOME/.local/bin" ]; sessionPath = [ "$HOME/.local/bin" ];
}; };
} }
-1
View File
@@ -43,7 +43,6 @@
signal-desktop signal-desktop
# dev tools # dev tools
ferdium
yaak yaak
bun bun
+1 -1
View File
@@ -39,7 +39,7 @@
ktlint ktlint
croc croc
opencode opencode
amp-cli process-compose
# typst # typst
typst typst
+2 -2
View File
@@ -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 ];
} }
+1 -1
View File
@@ -20,7 +20,7 @@
programs.password-store = { programs.password-store = {
enable = true; enable = true;
settings = { settings = {
PASSWORD_STORE_DIR = "/home/naps62/sync/pass"; PASSWORD_STORE_DIR = "${config.home.homeDirectory}/sync/pass";
}; };
}; };
} }
+1 -8
View File
@@ -15,12 +15,5 @@ in
XCURSOR_SIZE = cursorSize; XCURSOR_SIZE = cursorSize;
}; };
dconf = { dconf.enable = true;
enable = true;
# settings = {
# "org/gnome/desktop/interface" = {
# cursor-theme = "BreezeX-RosePine-Linux";
# };
# };
};
} }
+1 -22
View File
@@ -6,7 +6,6 @@
... ...
}: }:
let let
rofiLaunchers = import ../../../pkgs/rofi-launchers/package.nix { };
cfg = config.custom.hyprland; cfg = config.custom.hyprland;
in in
{ {
@@ -24,9 +23,7 @@ in
}; };
imports = [ imports = [
./rofi.nix
./cursor.nix ./cursor.nix
./waybar.nix
./noctalia ./noctalia
./wallpapers.nix ./wallpapers.nix
]; ];
@@ -53,17 +50,9 @@ in
enable = true; enable = true;
package = null; package = null;
portalPackage = null; portalPackage = null;
plugins = [ plugins = [ ];
# inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprfocus
# inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace
];
settings = { settings = {
plugin = { plugin = {
# hyprfocus = {
# enabled = true;
# mode = "flash";
# flash_opacity = 0.8; # Flash brighter instead of dimmer
# };
overview = { overview = {
autoDrag = true; autoDrag = true;
exitOnClick = true; exitOnClick = true;
@@ -116,7 +105,6 @@ in
decoration = { decoration = {
blur = { blur = {
enabled = true; enabled = true;
# new_optimizations = false;
popups = false; popups = false;
}; };
shadow = { shadow = {
@@ -219,21 +207,13 @@ in
bind = [ bind = [
"$mod, n, exec, noctalia-shell ipc call controlCenter toggle" "$mod, n, exec, noctalia-shell ipc call controlCenter toggle"
# "$mod, tab, overview:toggle,"
"$mod, b, exec, pkill waybar || waybar"
"$mod, t, exec, kitty" "$mod, t, exec, kitty"
"$mod, v, togglefloating" "$mod, v, togglefloating"
"$mod, q, killactive" "$mod, q, killactive"
"$mod, f, fullscreen, 0" "$mod, f, fullscreen, 0"
"$mod SHIFT, f, fullscreen, 1" "$mod SHIFT, f, fullscreen, 1"
# app launcher
"$mod, space, exec, noctalia-shell ipc call launcher toggle" "$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 # printscreen
", Print, exec, hyprshot -m region --raw | satty --filename - --output-filename ~/downloads/screenshots/$(date +%Y-%m-%d_%H-%M-%S).png" ", 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, 1, workspace, 1"
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mod, 3, workspace, 3" "$mod, 3, workspace, 3"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4" "$mod, 4, workspace, 4"
"$mod, 5, workspace, 5" "$mod, 5, workspace, 5"
"$mod, 6, workspace, 6" "$mod, 6, workspace, 6"
@@ -292,7 +292,7 @@ in
animationDisabled = false; animationDisabled = false;
animationSpeed = 1; animationSpeed = 1;
autoStartAuth = true; autoStartAuth = true;
avatarImage = "/home/naps62/.face"; avatarImage = "${config.home.homeDirectory}/.face";
boxRadiusRatio = 1; boxRadiusRatio = 1;
clockFormat = "hh\\nmm"; clockFormat = "hh\\nmm";
clockStyle = "custom"; clockStyle = "custom";
@@ -563,7 +563,7 @@ in
}; };
wallpaper = { wallpaper = {
automationEnabled = true; automationEnabled = true;
directory = "/home/naps62/.cache/wallpapers/3840x2160"; directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160";
enabled = true; enabled = true;
favorites = [ ]; favorites = [ ];
fillColor = "#5e81ac"; fillColor = "#5e81ac";
-7
View File
@@ -1,7 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
rofi
(callPackage ../../../../pkgs/rofi-launchers/package.nix { })
];
}
-173
View File
@@ -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;
}
'';
};
}
-1
View File
@@ -55,7 +55,6 @@ in
tab_bar_edge = "bottom"; tab_bar_edge = "bottom";
tab_bar_style = "powerline"; tab_bar_style = "powerline";
tab_powerline_style = "slanted"; 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:^$"; tab_bar_filter = "session:~ or session:^$";
# keys # keys
-3
View File
@@ -123,7 +123,4 @@ in
nerd-dictation-toggle nerd-dictation-toggle
pkgs.ydotool pkgs.ydotool
]; ];
# Note: You may need to enable ydotoold as a systemd service
# Either via NixOS configuration or by running: ydotoold &
} }
-13
View File
@@ -21,21 +21,8 @@
[build] [build]
rustflags = ["-Z", "threads=12"] 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 = { home.sessionVariables = {
OPENSSL_DIR = "${pkgs.openssl.dev}"; OPENSSL_DIR = "${pkgs.openssl.dev}";
OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
+1 -1
View File
@@ -1,4 +1,4 @@
{ inputs, pkgs, ... }: { 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 ];
} }
+3 -10
View File
@@ -8,8 +8,6 @@
}: }:
{ {
imports = [ imports = [
inputs.nix-colors.homeManagerModule
inputs.nixvim.homeModules.nixvim
../common/programs/default.nix ../common/programs/default.nix
../common/programs/desktop ../common/programs/desktop
../common/programs/zen-browser.nix ../common/programs/zen-browser.nix
@@ -89,17 +87,12 @@
wallpaper = { wallpaper = {
enableMultiMonitorDirectories = true; enableMultiMonitorDirectories = true;
monitorDirectories = [ monitorDirectories = [
{ monitor = "HDMI-A-1"; directory = "/home/naps62/.cache/wallpapers/3840x2160"; } { monitor = "HDMI-A-1"; directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160"; }
{ monitor = "DP-1"; directory = "/home/naps62/.cache/wallpapers/3840x2160"; } { monitor = "DP-1"; directory = "${config.home.homeDirectory}/.cache/wallpapers/3840x2160"; }
{ monitor = "DP-2"; directory = "/home/naps62/.cache/wallpapers/2160x3840"; } { monitor = "DP-2"; directory = "${config.home.homeDirectory}/.cache/wallpapers/2160x3840"; }
]; ];
}; };
}; };
programs.kitty.settings.font_size = 16; programs.kitty.settings.font_size = 16;
home = {
username = lib.mkDefault "naps62";
stateVersion = lib.mkDefault "24.05";
};
} }
+2 -35
View File
@@ -9,6 +9,7 @@
inputs.hardware.nixosModules.dell-xps-13-9315 inputs.hardware.nixosModules.dell-xps-13-9315
./hardware-configuration.nix ./hardware-configuration.nix
../common/global ../common/global
../common/features/user.nix
../common/features/laptop.nix ../common/features/laptop.nix
../common/features/networking.nix ../common/features/networking.nix
../common/features/gpu/intel-graphics.nix ../common/features/gpu/intel-graphics.nix
@@ -26,44 +27,10 @@
networking.hostName = "arrakis"; networking.hostName = "arrakis";
boot = { boot.kernelParams = [
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
kernelParams = [
"i915=force_probe=46a6" "i915=force_probe=46a6"
"i915.enable_psr=0" "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);
};
hardware.ipu6 = { hardware.ipu6 = {
enable = true; enable = true;
+1 -4
View File
@@ -10,8 +10,5 @@
users.groups.docker = { }; users.groups.docker = { };
networking.firewall = { networking.firewall.enable = false;
enable = false;
# checkReversePath = false;
};
} }
+1 -4
View File
@@ -1,10 +1,7 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
{ {
networking = { networking = {
networkmanager = { networkmanager.enable = true;
enable = true;
};
# wireless.iwd.enable = true;
}; };
services.avahi = { services.avahi = {
+1 -2
View File
@@ -2,7 +2,6 @@
{ {
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
# Add any missing dynamic libraries for unpackaged programs stdenv.cc.cc.lib
# here, NOT in environment.systemPackages
]; ];
} }
+35
View File
@@ -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";
}
-7
View File
@@ -12,13 +12,6 @@
gnumake gnumake
]; ];
programs.nix-ld = {
enable = true;
libraries = with pkgs; [
stdenv.cc.cc.lib
];
};
time = { time = {
timeZone = "Europe/Lisbon"; timeZone = "Europe/Lisbon";
}; };
+1 -39
View File
@@ -8,6 +8,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../common/global ../common/global
../common/features/user.nix
../common/features/networking.nix ../common/features/networking.nix
../common/features/gpu/nvidia.nix ../common/features/gpu/nvidia.nix
../common/features/display ../common/features/display
@@ -24,21 +25,6 @@
networking.hostName = "konishi"; 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 = '' services.xserver.displayManager.sessionCommands = ''
BOTTOM='HDMI-0' BOTTOM='HDMI-0'
TOP='DP-0' TOP='DP-0'
@@ -52,30 +38,6 @@
${pkgs.xrandr}/bin/xrandr --dpi 160 ${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 = [ networking.nameservers = [
"100.100.100.100" "100.100.100.100"
"10.1.10.1" "10.1.10.1"