diff --git a/flake.lock b/flake.lock index 93a8dde..57331a2 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -80,12 +80,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752331782, - "narHash": "sha256-eRDO93C2dXNVoLbnNECWwGcMErDKVAXNWWy6hFMPoE8=", - "rev": "33ffc091037908049e9897dc8258efae81709cfd", - "revCount": 259, + "lastModified": 1753068796, + "narHash": "sha256-jq04XAgT5Rci907wxd69trNwZixpnBLz5tH02h6JcoA=", + "rev": "9919bed0779086df2ce22a77f9406b7a347e340d", + "revCount": 261, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.8.2/0197ff1f-7dee-7ce8-803b-dee90b5d283c/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.8.4/01982b0e-46ed-709c-973b-7096ceb2a596/source.tar.gz" }, "original": { "type": "tarball", @@ -95,37 +95,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-T/kTCi8rrh1r5XMGQBymB4Hnk/KNNGkgtgma6bXXKy0=", + "narHash": "sha256-tEhYb3OWFIPFvWa/orkyBMvS2joRRrqKHpK2cSd20hU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-C+KvOykOIoXCWSsPBM2Hzy1skk2lgiKXQyb9fJdwSdQ=", + "narHash": "sha256-BGDnwwbo30fdSAv26G2MFYKx2+qIQ8G40+muwKH9SPM=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-cENobOVn0+FtON9bmr/QoUEpNGEyxW4YpFXkLyBTYDs=", + "narHash": "sha256-P4EJCgSsapE5tggKXiLUeS56PNciGLgonWAm7F1xf6E=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" } }, "disko": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1752718651, - "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1753387274, + "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", "type": "github" }, "original": { @@ -328,12 +328,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1752329813, - "narHash": "sha256-+PLMYzOLXmYtGUcUxIbJZpadAV/gO73EAhISc1kgvJM=", - "rev": "04045d5add7915ea9209a09833fae1aa3a3a9be1", - "revCount": 21488, + "lastModified": 1753066555, + "narHash": "sha256-/WmweOcc4DfQPfGkNxllsuEVgTwX3RVROOy3e/mAvr0=", + "rev": "47281531ec83e22a1bb0249db5a6e4d0d854f0a5", + "revCount": 21541, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.2/0197ff19-42da-7beb-b8cf-902b39687ccf/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.4/01982aff-6f3f-7bcc-85c8-b0d4e0cb35d8/source.tar.gz" }, "original": { "type": "tarball", @@ -388,12 +388,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751852175, - "narHash": "sha256-+MLlfTCCOvz4K6AcSPbaPiFM9MYi7fA2Wr1ibmRwIlM=", - "rev": "2defa37146df235ef62f566cde69930a86f14df1", - "revCount": 826355, + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "revCount": 827262, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.826355%2Brev-2defa37146df235ef62f566cde69930a86f14df1/0197e88b-d442-748b-8d6d-36a43b63b168/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.827262%2Brev-be9e214982e20b8310878ac2baa063a961c1bdf6/01980c9a-3044-72c0-b718-a99e9076d3d6/source.tar.gz" }, "original": { "type": "tarball", @@ -402,11 +402,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752750082, - "narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=", + "lastModified": 1753372006, + "narHash": "sha256-eyIYqerHPYHl2Eq802wJSOwMwZ3tdvJ4D+vckDe2mD8=", "owner": "danth", "repo": "stylix", - "rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08", + "rev": "ceda12a6da2181e424d8ed7e68ed291745f06f49", "type": "github" }, "original": { diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix index dc4ba11..d9a8855 100644 --- a/hosts/work/configuration.nix +++ b/hosts/work/configuration.nix @@ -56,5 +56,7 @@ security.sudo.wheelNeedsPassword = false; services.xserver.videoDrivers = [ "amdgpu" ]; + services.tailscale.enable = true; + system.stateVersion = "24.05"; } diff --git a/hosts/work/home.nix b/hosts/work/home.nix index fa30e9c..69bd74a 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -8,6 +8,7 @@ bundle.myhypr.enable = true; bundle.desktop-apps.enable = true; bundle.shell.enable = true; + programs.creativity.drawing.enable = true; }; home = { diff --git a/modules/home-manager/bundles/myhypr.nix b/modules/home-manager/bundles/myhypr.nix index 9e26436..6a1bb6c 100644 --- a/modules/home-manager/bundles/myhypr.nix +++ b/modules/home-manager/bundles/myhypr.nix @@ -9,11 +9,5 @@ config = lib.mkIf config.myHome.bundle.myhypr.enable { myHome.services.hyprland.enable = true; myHome.services.waybar.enable = true; - home.packages = map lib.lowPrio [ - pkgs.mako - pkgs.swayidle - pkgs.swaylock - pkgs.swaybg - ]; }; } diff --git a/modules/home-manager/bundles/work-apps.nix b/modules/home-manager/bundles/work-apps.nix index c17ae8c..5afc99d 100644 --- a/modules/home-manager/bundles/work-apps.nix +++ b/modules/home-manager/bundles/work-apps.nix @@ -8,6 +8,7 @@ options.myHome.bundle.work-apps.enable = lib.mkEnableOption "enable work-apps bundle"; config = lib.mkIf config.myHome.bundle.work-apps.enable { home.packages = map lib.lowPrio [ + pkgs.tailscale pkgs.tailscale-systray pkgs.slack pkgs.openvpn diff --git a/modules/home-manager/programs/creativity.nix b/modules/home-manager/programs/creativity.nix index 71ef2c4..ce1452b 100644 --- a/modules/home-manager/programs/creativity.nix +++ b/modules/home-manager/programs/creativity.nix @@ -4,23 +4,45 @@ lib, ... }: +let + drawing-apps = with pkgs; [ + gimp + tiled + aseprite + inkscape + sweethome3d.application + ]; + printing-apps = with pkgs; [ + blender + prusa-slicer + openscad + ]; + gamedev-apps = with pkgs; [ + godot_4 + gdtoolkit_4 + ]; + sound-apps = with pkgs; [ + audacity + sfxr + ]; +in { - options.myHome.programs.creativity.enable = lib.mkEnableOption "enable creativity software"; - config = lib.mkIf config.myHome.programs.creativity.enable { - home.packages = with pkgs; [ - blender - tiled - aseprite - inkscape - - prusa-slicer - openscad - - godot_4 - gdtoolkit_4 - - audacity - sfxr - ]; + options.myHome.programs.creativity = lib.mkOption { + type = lib.types.submodule { + options = { + drawing.enable = lib.mkEnableOption "enable drawing software"; + printing.enable = lib.mkEnableOption "enable 3d (printing) software"; + gamedev.enable = lib.mkEnableOption "enable gamedev software"; + sound.enable = lib.mkEnableOption "enable sound making software"; + }; + }; + default = { }; }; + + config.home.packages = lib.concatLists [ + (lib.optionals config.myHome.programs.creativity.drawing.enable drawing-apps) + (lib.optionals config.myHome.programs.creativity.printing.enable printing-apps) + (lib.optionals config.myHome.programs.creativity.gamedev.enable gamedev-apps) + (lib.optionals config.myHome.programs.creativity.sound.enable sound-apps) + ]; } diff --git a/modules/home-manager/programs/kitty.nix b/modules/home-manager/programs/kitty.nix index 4dd17ca..7fc475f 100644 --- a/modules/home-manager/programs/kitty.nix +++ b/modules/home-manager/programs/kitty.nix @@ -19,16 +19,16 @@ dynamic_background_opacity = true; enable_audio_bell = false; mouse_hide_wait = "-1.0"; - background_opacity = "0.5"; + background_opacity = "0.6"; background_blur = 5; font_family = "Fira Code"; }; - extraConfig = '' - tab_bar_style fade - tab_fade 1 - active_tab_font_style bold - inactive_tab_font_style bold - ''; + # extraConfig = '' + # tab_bar_style fade + # tab_fade 1 + # active_tab_font_style bold + # inactive_tab_font_style bold + # ''; }; }; } diff --git a/modules/home-manager/programs/photos.nix b/modules/home-manager/programs/photos.nix index 75fc126..d88660c 100644 --- a/modules/home-manager/programs/photos.nix +++ b/modules/home-manager/programs/photos.nix @@ -9,7 +9,10 @@ config = lib.mkIf config.myHome.programs.photos.enable { home.packages = with pkgs; [ # gimp - rawtherapee + gphoto2 + # rawtherapee + darktable + exiftool ]; }; } diff --git a/modules/home-manager/services/hyprland.nix b/modules/home-manager/services/hyprland.nix index 27c5cde..648d77e 100644 --- a/modules/home-manager/services/hyprland.nix +++ b/modules/home-manager/services/hyprland.nix @@ -25,11 +25,17 @@ slurp swappy grim - rofi ]; + programs = { + rofi.enable = true; + swaylock.enable = true; + }; services = { picom.enable = true; + hyprsunset.enable = true; + mako.enable = true; + swayidle.enable = true; }; xdg.portal = { diff --git a/modules/nixos/features/stylix.nix b/modules/nixos/features/stylix.nix index 27f746d..dcb8ffc 100644 --- a/modules/nixos/features/stylix.nix +++ b/modules/nixos/features/stylix.nix @@ -7,11 +7,16 @@ { options.myNixOS.feature.stylix.enable = lib.mkEnableOption "enable Stylix"; config = lib.mkIf config.myNixOS.feature.stylix.enable { + environment.systemPackages = with pkgs; [ + base16-schemes + ]; stylix = { enable = true; + autoEnable = true; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-storm.yaml"; image = ../../../wall.jpg; polarity = "dark"; - opacity.terminal = 0.9; + opacity.terminal = 0.8; cursor.package = pkgs.bibata-cursors; cursor.name = "Bibata-Modern-Ice"; cursor.size = 24; @@ -35,12 +40,12 @@ popups = 12; }; }; - targets = { - chromium.enable = true; - grub.enable = true; - grub.useImage = true; - plymouth.enable = true; - }; + # targets = { + # chromium.enable = true; + # grub.enable = true; + # grub.useImage = true; + # plymouth.enable = true; + # }; }; }; } diff --git a/wall.jpg b/wall.jpg index ffa2dc9..b1399e3 100644 Binary files a/wall.jpg and b/wall.jpg differ diff --git a/wallpapers/wall-scenery-cat.jpg b/wallpapers/wall-scenery-cat.jpg new file mode 100644 index 0000000..b1399e3 Binary files /dev/null and b/wallpapers/wall-scenery-cat.jpg differ diff --git a/wallpapers/wall-scenery.jpg b/wallpapers/wall-scenery.jpg new file mode 100644 index 0000000..4320aeb Binary files /dev/null and b/wallpapers/wall-scenery.jpg differ