From 9e08a8e8056f63b7a471d253bab5ea3085fb12cc Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 4 Mar 2026 16:48:43 +0100 Subject: [PATCH] add ignis to flake --- configuration.nix | 15 ++++++++++++++- flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 7 ++++++- home/home.nix | 10 ++++++++++ home/hyprland.nix | 12 +----------- home/programs.nix | 30 +++++++++++++++++++++++++++--- home/stylix.nix | 1 + home/waybar.nix | 5 ++--- stylix.nix | 9 ++------- 9 files changed, 106 insertions(+), 26 deletions(-) diff --git a/configuration.nix b/configuration.nix index fc5510c..d201075 100755 --- a/configuration.nix +++ b/configuration.nix @@ -19,10 +19,12 @@ noto-fonts-cjk-sans noto-fonts nerd-fonts._0xproto + gnome-tweaks ]; }; services.displayManager.gdm.enable = true; services.desktopManager.gnome.enable = true; + programs.hyprland.enable = true; boot = { @@ -58,7 +60,17 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - security.sudo.enable = true; + security.doas.enable = true; + security.sudo.enable = false; + security.doas.extraRules = [ + { + users = [ "foo" ]; + # Optional, retains environment variables while running commands + # e.g. retains your NIX_PATH when applying your config + keepEnv = true; + persist = true; # Optional, only require password verification a single time + } + ]; # Use latest kernel. boot.kernelPackages = pkgs.linuxPackages_latest; @@ -127,6 +139,7 @@ fastfetch gnomeExtensions.blur-my-shell gnomeExtensions.appindicator + gnomeExtensions.just-perfection ]; programs.steam = { diff --git a/flake.lock b/flake.lock index 86ca40a..8b72d6d 100644 --- a/flake.lock +++ b/flake.lock @@ -179,6 +179,48 @@ "type": "github" } }, + "ignis": { + "inputs": { + "ignis-gvc": "ignis-gvc", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767456002, + "narHash": "sha256-q+ZYdTMLr0RCfN5qxOl56CbZBj702hYY2H5dOLynW+o=", + "owner": "ignis-sh", + "repo": "ignis", + "rev": "5fd140227c0f2d9d65a98d4af78b95b1558966da", + "type": "github" + }, + "original": { + "owner": "ignis-sh", + "repo": "ignis", + "type": "github" + } + }, + "ignis-gvc": { + "inputs": { + "nixpkgs": [ + "ignis", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754064086, + "narHash": "sha256-ft5KvY2OYrWF+jEsfBL/Zx8Iuo2C10C6COk8wHwZw34=", + "owner": "ignis-sh", + "repo": "ignis-gvc", + "rev": "f2c9f10d8b49cc38106a2f07a51ea959c6aa4e63", + "type": "github" + }, + "original": { + "owner": "ignis-sh", + "repo": "ignis-gvc", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1770841267, @@ -304,6 +346,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "ignis": "ignis", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", diff --git a/flake.nix b/flake.nix index f3f94e7..3f988ae 100755 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,10 @@ nixvim.url = "github:nix-community/nixvim"; home-manager.url = "github:nix-community/home-manager"; + ignis = { + url = "github:ignis-sh/ignis"; + inputs.nixpkgs.follows = "nixpkgs"; # recommended + }; }; outputs = @@ -16,7 +20,7 @@ nixvim, home-manager, ... - }: + }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; @@ -48,6 +52,7 @@ homeConfigurations.lucy = home-manager.lib.homeManagerConfiguration { inherit pkgs; + extraSpecialArgs = { inherit inputs; }; modules = [ stylix.homeModules.stylix nixvim.homeModules.nixvim diff --git a/home/home.nix b/home/home.nix index 9e119f8..32ab0a5 100755 --- a/home/home.nix +++ b/home/home.nix @@ -17,6 +17,16 @@ # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + package = pkgs.runCommand "teto-cursors" { } '' + mkdir -p $out/share/icons + ln -s /home/lucy/.icons/tetoW/ $out/share/icons/ + ''; + name = "tetoW"; + size = 48; + }; programs.zsh = { enable = true; diff --git a/home/hyprland.nix b/home/hyprland.nix index a7e27ef..d6b2438 100755 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -45,8 +45,7 @@ ]; }; input = { - kb_layout = "de"; - kb_options = "nodeadkeys"; + kb_layout = "eu"; sensitivity = 0.3; accel_profile = "flat"; natural_scroll = true; @@ -123,14 +122,5 @@ "$mod, mouse:272, movewindow" "alt, mouse:272, resizewindow" ]; - layerrule = [ - "noanim, walker" - ]; - windowrule = [ - "float, class:^(waypaper)" - "float, class:^(Ryujinx)" - "suppressevent maximize, class:.*" - "nofocus, class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" - ]; }; } diff --git a/home/programs.nix b/home/programs.nix index cd7b606..6db6517 100755 --- a/home/programs.nix +++ b/home/programs.nix @@ -1,9 +1,11 @@ { config, pkgs, + inputs, ... }: { + imports = [ inputs.ignis.homeManagerModules.default ]; home.packages = with pkgs; [ nixfmt google-chrome @@ -19,8 +21,9 @@ fd ripgrep ani-cli - cinny-desktop - (discord.override { + element-desktop + gnome-tweaks + (discord.override { withOpenASAR = true; # can do this here too withVencord = true; }) @@ -33,6 +36,27 @@ }; }; + programs.ignis = { + enable = true; + addToPythonEnv = true; + services = { + bluethooth.enable = true; + recorder.enable = true; + audio.enable = true; + network.enable = true; + hyprland.enable = true; + }; + sass = { + enable = true; + useDartSass = true; + }; + extraPackages = with pkgs; [ + hello + python313Packages.jinja2 + python313Packages.materialyoucolor + python313Packages.pillow + ]; + }; programs.spicetify.enable = true; programs.fastfetch = { enable = true; @@ -161,7 +185,7 @@ }; }; programs.vesktop = { - enable = true; + enable = false; settings = { staticTitle = true; arRPC = true; diff --git a/home/stylix.nix b/home/stylix.nix index 4eaee78..6af966d 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -1,6 +1,7 @@ { stylix = { image = ./wallpaper.png; + polarity = "dark"; targets = { waybar.enable = true; waybar.addCss = false; diff --git a/home/waybar.nix b/home/waybar.nix index 0fe393f..6c5e242 100755 --- a/home/waybar.nix +++ b/home/waybar.nix @@ -17,8 +17,7 @@ #workspaces button { all: unset; - padding: 1px 6px; - margin: 2px; + padding: 1px 3px; color: alpha(@base05, 0.5); border-radius: 1em; } @@ -30,7 +29,7 @@ #workspaces { margin: 0px; - padding: 2px; + padding: 2px 6px; background-color: @base00; border-radius: 1em; } diff --git a/stylix.nix b/stylix.nix index 7a5c21a..a4b7596 100755 --- a/stylix.nix +++ b/stylix.nix @@ -6,15 +6,10 @@ }: { stylix.opacity = { - terminal = 0.8; + terminal = 1.0; desktop = 1.0; popups = 1.0; }; - stylix.cursor = { - name = "macOS"; - package = pkgs.apple-cursor; - size = 24; - }; stylix.icons = { enable = true; dark = "Papirus-Dark"; @@ -24,7 +19,7 @@ stylix = { enable = true; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; polarity = "dark"; image = ./home/wallpaper.png; targets = {