From fad2d4f5d58ce3778e91c0bf4a2804fe66761ea7 Mon Sep 17 00:00:00 2001 From: Daniel Meiburg Date: Sat, 30 Sep 2023 22:22:39 +0200 Subject: [PATCH] update --- dotfiles | 2 +- flake.lock | 6 +- home.nix | 166 ++++++++++++++++---------------- hosts/firefly/configuration.nix | 2 + 4 files changed, 90 insertions(+), 86 deletions(-) diff --git a/dotfiles b/dotfiles index 261b4c3..da5f124 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 261b4c3691dfacd55aefea5db722253436dde289 +Subproject commit da5f124c2d20ab9af2e8ffd16b0009b5fed11952 diff --git a/flake.lock b/flake.lock index 53a5226..54fc770 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695940289, - "narHash": "sha256-z9DItQvCasu7sexaz1GZ+uOymDRpuEehFwRKToCooJ8=", + "lastModified": 1696063111, + "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d4cdf8cc4da54beb5d2e927af7a259bb4a00645", + "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index ee81d5d..dc8c851 100644 --- a/home.nix +++ b/home.nix @@ -1,98 +1,100 @@ { pkgs, ...}: { - home.packages = with pkgs; [ - firefox-wayland - tmux - gnupg - htop - ripgrep - pavucontrol - pass - kitty - waybar - pulseaudio - gcc - fzf - nnn - gnumake - tree-sitter - nodejs - pinentry-qt - kanshi - mpv - ffmpeg - xdg-utils - networkmanagerapplet - git-lfs - git - thunderbird - # All of the below is for sway - wl-clipboard - bemenu - ]; + home.packages = with pkgs; [ + firefox-wayland + tmux + libnotify + gnupg + htop + ripgrep + pavucontrol + pass + kitty + waybar + pulseaudio + gcc + fzf + nnn + gnumake + tree-sitter + nodejs + pinentry-qt + kanshi + mpv + megatools + ffmpeg + xdg-utils + networkmanagerapplet + git-lfs + git + thunderbird + libreoffice + wl-clipboard + bemenu + ]; home.stateVersion = "22.11"; programs.home-manager = { - enable = true; - }; - home.file = { - ".config/" = { - source = ./dotfiles/.config; - recursive = true; - }; - }; - home.file = { - ".xkb/" = { - source = ./dotfiles/.xkb; - recursive = true; - }; - }; - home.file = { - ".profile" = { - source = ./dotfiles/.profile; - recursive = true; - }; - }; - home.file = { - ".tmux.conf" = { - source = ./dotfiles/.tmux.conf; - recursive = true; - }; - }; - wayland.windowManager.sway = { - enable = true; - wrapperFeatures.gtk = true; - }; - programs.browserpass = { - enable = true; - }; - services.mako = { - enable = true; - }; - home.pointerCursor = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 24; - x11 = { enable = true; - defaultCursor = "Adwaita"; - }; - }; - gtk = { - enable = true; - theme = { - package = pkgs.nordic; - name = "Nordic"; }; + home.file = { + ".config/" = { + source = ./dotfiles/.config; + recursive = true; + }; + }; + home.file = { + ".xkb/" = { + source = ./dotfiles/.xkb; + recursive = true; + }; + }; + home.file = { + ".profile" = { + source = ./dotfiles/.profile; + recursive = true; + }; + }; + home.file = { + ".tmux.conf" = { + source = ./dotfiles/.tmux.conf; + recursive = true; + }; + }; + wayland.windowManager.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + programs.browserpass = { + enable = true; + }; + services.mako = { + enable = true; + }; + home.pointerCursor = { + name = "Adwaita"; + package = pkgs.gnome.adwaita-icon-theme; + size = 24; + x11 = { + enable = true; + defaultCursor = "Adwaita"; + }; + }; + gtk = { + enable = true; + theme = { + package = pkgs.nordic; + name = "Nordic"; + }; }; xdg = { mime.enable = true; mimeApps = { enable = true; defaultApplications = { - "text/plain" = "nvim.desktop"; - "video/x-matroska" = "mpv.desktop"; + "text/plain" = "nvim.desktop"; + "video/x-matroska" = "mpv.desktop"; + }; }; }; - }; } diff --git a/hosts/firefly/configuration.nix b/hosts/firefly/configuration.nix index e4a6256..60f3be6 100644 --- a/hosts/firefly/configuration.nix +++ b/hosts/firefly/configuration.nix @@ -18,6 +18,8 @@ "/crypto_keyfile.bin" = null; }; + boot.kernelPackages = pkgs.linuxPackages_latest; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions