diff --git a/config/.config/rofi/menus/launcher/flor01.png b/config/.config/rofi/menus/launcher/flor01.png deleted file mode 100644 index 6dfd601..0000000 Binary files a/config/.config/rofi/menus/launcher/flor01.png and /dev/null differ diff --git a/config/.config/rofi/menus/launcher/launcher.rasi b/config/.config/rofi/menus/launcher/launcher.rasi index ee201be..6a78f03 100644 --- a/config/.config/rofi/menus/launcher/launcher.rasi +++ b/config/.config/rofi/menus/launcher/launcher.rasi @@ -50,7 +50,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/menus/launcher/flor01.png", width); + background-image: url("~/.config/rofi/nix.png", width); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/flake.lock b/flake.lock index f548867..a0402a3 100644 --- a/flake.lock +++ b/flake.lock @@ -135,12 +135,28 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1669288341, + "narHash": "sha256-lGwsFdSDb+IBXSJwKhNLOP2yt7PDXxbL0uxN9ZVOy8I=", + "owner": "nix-community", + "repo": "NUR", + "rev": "107aad385e04edf5b4bd4136bf8defcd890ecfc7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nur": "nur" } } }, diff --git a/flake.nix b/flake.nix index bc8f8e1..86a0bd8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,22 @@ inputs = { + # - Nixpkgs ---------------------------------- nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; + # - Home-Manager ----------------------------- home-manager.url = "github:nix-community/home-manager/release-22.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nix-colors.url = "github:misterio77/nix-colors"; + # - NUR -------------------------------------- + nur.url = "github:nix-community/NUR"; + # - Overlays --------------------------------- emacs-overlay.url = "github:nix-community/emacs-overlay"; + # - Themeing --------------------------------- + nix-colors.url = "github:misterio77/nix-colors"; + }; outputs = inputs @ { self, nixpkgs, home-manager, ... }: @@ -21,7 +28,7 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; - overlays = import ./overlays; + overlays = import ./overlays { inherit inputs; }; }; lib = nixpkgs.lib.extend diff --git a/hosts/reykjavik/hardware.nix b/hosts/reykjavik/hardware.nix index c942207..4f23117 100644 --- a/hosts/reykjavik/hardware.nix +++ b/hosts/reykjavik/hardware.nix @@ -39,8 +39,8 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # # Keyboard light - # services.udev.extraRules = '' - # SUBSYSTEM=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="c101", MODE="0666" - # ''; + # Keyboard light + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="c101", MODE="0666" + ''; } diff --git a/modules/app/firefox.nix b/modules/app/firefox.nix index 4620b5e..4c54f90 100644 --- a/modules/app/firefox.nix +++ b/modules/app/firefox.nix @@ -16,5 +16,19 @@ in samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable { "${i3Cfg.mod}+Shift+i" = "exec ${pkgs.firefox}/bin/firefox"; }; + + hm.programs.firefox = { + enable = true; + # extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + # # See https://nur.nix-community.org/repos/rycee/ + # firefox-color + # ]; + profiles.default = { + id = 0; + name = "Default"; + isDefault = true; + }; + }; + }; } diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix index bfc9e06..ea13ca2 100644 --- a/modules/desktop/rofi.nix +++ b/modules/desktop/rofi.nix @@ -1,7 +1,8 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let cfg = config.samfelag.modules.desktop.rofi; + nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; }; in { options.samfelag.modules.desktop.rofi = { @@ -13,15 +14,21 @@ in ]; hm.xdg.configFile."rofi/menus".source = ../../config/.config/rofi/menus; + hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme { + scheme = config.colorScheme; + width = 600; + height = 600; + logoScale = 2.0; + }; # Themeing --------------------------------- hm.xdg.configFile."rofi/theme.rasi".text = '' * { font: "Iosevka Nerd Font 10"; background: #${config.colorScheme.colors.base00}; - background-alt: #${config.colorScheme.colors.base01}; + background-alt: #${config.colorScheme.colors.base02}; foreground: #${config.colorScheme.colors.base05}; - selected: #${config.colorScheme.colors.base02}; + selected: #${config.colorScheme.colors.base03}; active: #${config.colorScheme.colors.base07}; urgent: #${config.colorScheme.colors.base06}; } diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 2611fb1..a7e197f 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -59,6 +59,16 @@ in name = "powerlevel10k"; src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k"; } + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.5.0"; + sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91"; + }; + } ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index 5295c90..1a5447a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,3 +1,5 @@ +{ inputs, ... }: [ - (import ./discord.nix) + (import ./discord.nix { }) + (import ./nur.nix { nur = inputs.nur; }) ] diff --git a/overlays/discord.nix b/overlays/discord.nix index 6fcd63d..2771a88 100644 --- a/overlays/discord.nix +++ b/overlays/discord.nix @@ -1,6 +1,9 @@ -self: super: -{ - discord = super.discord.overrideAttrs (_: { - src = builtins.fetchTarball https://discord.com/api/download?platform=linux&format=tar.gz; - }); -} +{ ... }: +( + final: prev: + { + discord = prev.discord.overrideAttrs (_: { + src = builtins.fetchTarball https://discord.com/api/download?platform=linux&format=tar.gz; + }); + } +) diff --git a/overlays/nur.nix b/overlays/nur.nix new file mode 100644 index 0000000..585e299 --- /dev/null +++ b/overlays/nur.nix @@ -0,0 +1,9 @@ +{ nur, ... }: +( + final: prev: { + nur = import nur { + nurpkgs = prev; + pkgs = prev; + }; + } +)