From 3d4e2102b3499b3bbaaf415f320b717d1fb9e657 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 18:45:56 +0000 Subject: [PATCH 01/13] Fixing arrakis --- home/arrakis/default.nix | 2 +- home/arrakis/monitors.nix | 24 +++++++++++++++ home/common/programs/desktop/default.nix | 5 ++++ home/common/programs/git/default.nix | 3 ++ home/common/programs/hyprland/default.nix | 36 ++++++++++++++++------- home/common/programs/kitty.nix | 7 +++-- home/common/programs/rust.nix | 5 ++-- home/common/programs/zsh.nix | 1 + home/desktop/default.nix | 10 ++++++- home/desktop/monitors.nix | 32 ++++++++++++++++++++ 10 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 home/arrakis/monitors.nix create mode 100644 home/desktop/monitors.nix diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 686dd93..a70a0dc 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -21,6 +21,7 @@ ../common/features/colorscheme.nix ../common/features/xdg.nix ../common/features/bluetooth.nix + ./monitors.nix ]; home.sessionVariables = { @@ -31,7 +32,6 @@ }; wayland.windowManager.hyprland.settings = { - monitor = [ "eDP-1, preferred, 0x1080, 1, bitdepth, 8" ]; windowrulev2 = [ "float, class:thunar" "move cursor -50% -50%, class:thunar" diff --git a/home/arrakis/monitors.nix b/home/arrakis/monitors.nix new file mode 100644 index 0000000..8c3943a --- /dev/null +++ b/home/arrakis/monitors.nix @@ -0,0 +1,24 @@ +{ + inputs, + pkgs, + config, + ... +}: +let + wallpaper1 = pkgs.fetchurl { + url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; + hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; + }; +in +{ + wayland.windowManager.hyprland.settings = { + monitor = [ + "eDP-1, preferred, 0x0, 1, bitdepth, 8" + ]; + }; + + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "eDP-1,${builtins.toString wallpaper1}" + ]; +} diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index d4e049a..0b7ca9f 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -19,6 +19,11 @@ zathura lxappearance + # networking + networkmanagerapplet + mtr + dnsutils + # communication slack zoom-us diff --git a/home/common/programs/git/default.nix b/home/common/programs/git/default.nix index 50b3ade..74da270 100644 --- a/home/common/programs/git/default.nix +++ b/home/common/programs/git/default.nix @@ -30,6 +30,9 @@ w = "commit -am 'wip'"; }; extraConfig = { + init = { + defaultBranch = "main"; + }; core = { editor = "nvim"; pager = "delta"; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index d5fe280..5c01c85 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -31,9 +31,10 @@ in new_optimizations = "on"; }; - drop_shadow = "yes"; - shadow_range = 2; - shadow_render_power = 1; + # shadow = { + # range = 2; + # render_power = 4; + # }; }; input = { @@ -54,14 +55,19 @@ in }; general = { - gaps_in = 2; + border_size = 0; + gaps_in = 4; gaps_out = 0; }; - monitor = [ - "eDP-1, 1920x1080, 0x0, 1" - "DP-1, 1920x1080, auto, 1, mirror, eDP-1" - ]; + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + }; + + xwayland = { + force_zero_scaling = true; + }; animations = { bezier = "easeOutQuad, 0.5, 1, 0.89, 1"; @@ -79,14 +85,15 @@ in dwindle = { preserve_split = "yes"; - no_gaps_when_only = true; }; + master = { orientation = "center"; - no_gaps_when_only = true; }; env = [ + "GDK_SCALE, 2" + "XCURSOR_SIZE, 32" "HYPRCURSOR_THEME, rose-pine-hyprcursor" "HYPRCURSOR_SIZE, 24" ]; @@ -94,6 +101,7 @@ in "exec-once" = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "hyprpanel" + "nm-applet" ]; windowrulev2 = [ @@ -180,4 +188,12 @@ in ]; }; }; + + services.hyprpaper = { + enable = true; + settings = { + ipc = "on"; + splash = false; + }; + }; } diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix index ff52139..138b363 100644 --- a/home/common/programs/kitty.nix +++ b/home/common/programs/kitty.nix @@ -1,9 +1,11 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +{ programs.kitty = { enable = true; settings = { confirm_os_window_close = 0; enable_audio_bell = false; + cursor_trail = 1; enabled_layouts = "tall, grid, fat, splits"; @@ -18,8 +20,7 @@ tab_bar_edge = "bottom"; tab_bar_style = "powerline"; tab_powerline_style = "slanted"; - tab_title_template = - "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; + tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; # keys kitty_mod = "alt"; diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index 1875b56..de63c03 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -4,14 +4,15 @@ rustup bacon mprocs + ra-multiplex ]; home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; systemd.user.services.ra-multiplex = { Service = { - ExecStart = "/home/naps62/.cargo/bin/ra-multiplex server"; + ExecStart = "${pkgs.ra-multiplex}/bin/ra-multiplex server"; }; - Install.WantedBy = [ "multi-user.target" ]; + Install.WantedBy = [ "default.target" ]; }; } diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index aca117c..a5d540d 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -93,6 +93,7 @@ procs eza asdf-vm + fd ]; home.sessionPath = [ diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 686dd93..fc55265 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -21,6 +21,7 @@ ../common/features/colorscheme.nix ../common/features/xdg.nix ../common/features/bluetooth.nix + ./monitors.nix ]; home.sessionVariables = { @@ -31,11 +32,18 @@ }; wayland.windowManager.hyprland.settings = { - monitor = [ "eDP-1, preferred, 0x1080, 1, bitdepth, 8" ]; windowrulev2 = [ + # thunar "float, class:thunar" "move cursor -50% -50%, class:thunar" "size 800 600, class:thunar" + + # ethui-dev + "workspace 1, class:ethui" + "float, class:ethui" + "size 800 800, class:ethui" + "move 100%-800 100%-800, class:ethui" + "noinitialfocus, class:ethui" ]; }; diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix new file mode 100644 index 0000000..e60af61 --- /dev/null +++ b/home/desktop/monitors.nix @@ -0,0 +1,32 @@ +{ + inputs, + pkgs, + config, + ... +}: +let + wallpaper1 = pkgs.fetchurl { + url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; + hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; + }; +in +{ + wayland.windowManager.hyprland.settings = { + monitor = [ + "DP-1, preferred, 0x0, auto, bitdepth, 8" + "HDMI-A-1, preferred, 2560x0, auto, bitdepth, 8" + ]; + workspace = [ + "1, monitor=HDMI-A-1" + "2, monitor=DP-1" + "3, monitor=DP-1" + "4, monitor=DP-1" + ]; + }; + + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "DP-1,${builtins.toString wallpaper1}" + "HDMI-A-1,${builtins.toString wallpaper1}" + ]; +} From 1cbd9bb1deb408b0c062f9da08cc54f3d9f905df Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 18:46:21 +0000 Subject: [PATCH 02/13] wip --- hosts/desktop/hardware-configuration.nix | 54 ++++++++++++++++-------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 81bf29e..0d25c6e 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,34 +1,52 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "thunderbolt" ]; + boot.initrd.availableKernelModules = [ + "vmd" + "xhci_pci" + "ahci" + "nvme" + "thunderbolt" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb"; + boot.initrd.luks.devices = { + "luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb"; + "luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device = "/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/D86A-A762"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/d102468f-46c6-4eeb-bd8c-1f9f049d1feb"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/D86A-A762"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/mapper/luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 2cd955331caf358df10694fd1bdf3877ddcdd058 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 18:47:42 +0000 Subject: [PATCH 03/13] wip --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index ff06e21..33dc899 100644 --- a/flake.lock +++ b/flake.lock @@ -288,16 +288,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730625090, - "narHash": "sha256-lWfkkj+GEUM0UqYLD2Rx3zzILTL3xdmGJKGR4fwONpA=", + "lastModified": 1733389821, + "narHash": "sha256-stiL/HTX6GJz/M9wtOfFum4SEc9i1AtguOYjkbUQscI=", "owner": "shazow", "repo": "foundry.nix", - "rev": "1c6a742bcbfd55a80de0e1f967a60174716a1560", + "rev": "6edd3054bde0967683a1c2d94907a84e778dc295", "type": "github" }, "original": { "owner": "shazow", - "ref": "monthly", "repo": "foundry.nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 50e5eb5..1ed6a09 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ flake = false; }; foundry = { - url = "github:shazow/foundry.nix/monthly"; + url = "github:shazow/foundry.nix"; }; utils.url = "github:numtide/flake-utils"; hardware.url = "github:NixOS/nixos-hardware/master"; From a57dd139d0fe3c78eaa486fa3479f74eb995dddf Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 18:49:27 +0000 Subject: [PATCH 04/13] wip --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 33dc899..e94c705 100644 --- a/flake.lock +++ b/flake.lock @@ -1001,11 +1001,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1731410731, - "narHash": "sha256-g9rA4Sd6vXCPf0nMimq0eqSYbEy8suKbtJ7HwRBt2zQ=", + "lastModified": 1733233534, + "narHash": "sha256-LD7b4v8cIQ6xh+5jYGdXMwrWPCx9axe8bRIyyAxZfVs=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "0c20f410afc8a2156488a7c7ae73a242bfa7e106", + "rev": "3dd6ed2d3f5ce4acce10919aae56f632bb6f32c3", "type": "github" }, "original": { From d006650cf9c2cb6aba4fff0ff29088823bac10be Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:08:24 +0000 Subject: [PATCH 05/13] wip --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index e94c705..e63341b 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1733001911, + "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -699,16 +699,16 @@ ] }, "locked": { - "lastModified": 1729544999, - "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "owner": "NuschtOS", "repo": "ixx", - "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.5", + "ref": "v0.0.6", "repo": "ixx", "type": "github" } @@ -779,11 +779,11 @@ ] }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -919,11 +919,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -962,11 +962,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730569492, - "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=", + "lastModified": 1733369744, + "narHash": "sha256-b2atMLs0myUiD5qnIxEko/gO/+ViNOGLNZnUFnYQ3bM=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce", + "rev": "38885227461de58a712362c1c484803d6c90a8b2", "type": "github" }, "original": { @@ -985,11 +985,11 @@ ] }, "locked": { - "lastModified": 1730515563, - "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { From 16e14c7aca07dec2e6f746dd20206f6cfed1a7c4 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:09:33 +0000 Subject: [PATCH 06/13] wip --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index e63341b..0e0d521 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1730635639, - "narHash": "sha256-B3PP5BGzu1PVb2e978uXj+7gWRJMHUAE5eUXxyHTxHQ=", + "lastModified": 1733390410, + "narHash": "sha256-bM3FIksaYkRloRh3y6GzuUrsJB7EizYtzeCgyftQ9rc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "178c79df993216cc9be02630d6cf42868b29f9c2", + "rev": "5f39164f253794b0101d596b7d4a7a0253f4b762", "type": "gitlab" }, "original": { @@ -128,11 +128,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -427,11 +427,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -723,11 +723,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1730088025, - "narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=", + "lastModified": 1733385688, + "narHash": "sha256-jbQXC1STBBX/APf02PFEFCC4w1IRUr7uow++VpPEYUY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f35afbe60a4ff71fd65fec3839fc38943f961951", + "rev": "f12eb4fd26fd545f50ccb43637f9f72e4a0ef490", "type": "github" }, "original": { @@ -739,11 +739,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1733329564, + "narHash": "sha256-TAruRTODE/Om/EGOZwPaEPNY6DlgeB6hdYQNSyGNIHk=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "8f84167c30692555d3332565605e8a625aebc43c", "type": "github" }, "original": { @@ -887,11 +887,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { From de372aa5a9cfab7540f49fba5ef244698c54a4bd Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:11:36 +0000 Subject: [PATCH 07/13] wip --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0e0d521..26d3f43 100644 --- a/flake.lock +++ b/flake.lock @@ -1024,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1730543154, - "narHash": "sha256-r12a4K6sZaTcmj4cu+ClDern7JMP/k/O82ZBCrgfXog=", + "lastModified": 1733317423, + "narHash": "sha256-duLKUBfQbZ8L/Oq4YiMU9DMjXQWu5q3jSIb6L7BPPgM=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "9d7eabd828eb01d9bb0968a5b901683a5da4a3ff", + "rev": "1e9acb02bdc8d72804338bce6f960b15b0a06a5b", "type": "github" }, "original": { @@ -1226,11 +1226,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { From 448e1d7c0d21810518525679e8c571107791683e Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:12:24 +0000 Subject: [PATCH 08/13] wip --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 26d3f43..520b223 100644 --- a/flake.lock +++ b/flake.lock @@ -404,11 +404,11 @@ }, "hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { From 137a36e8626c3dba37c9acaf2969aa1d00bf67e8 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:15:00 +0000 Subject: [PATCH 09/13] wip --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 520b223..ba56dcf 100644 --- a/flake.lock +++ b/flake.lock @@ -1064,11 +1064,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718180692, - "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "lastModified": 1733265112, + "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "rev": "89dc9e347ce8da26766ad421b0899536f9f87639", "type": "github" }, "original": { From c0277da8b8c8f2caa134d1156405767c6bf8cfb4 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 19:23:02 +0000 Subject: [PATCH 10/13] wip --- flake.lock | 121 +++++++++++++++++++++++++----- flake.nix | 2 +- hosts/arrakis/default.nix | 2 +- hosts/common/features/wayland.nix | 5 ++ hosts/desktop/default.nix | 2 +- 5 files changed, 109 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index ba56dcf..f5d8c4f 100644 --- a/flake.lock +++ b/flake.lock @@ -126,6 +126,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -141,7 +157,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -157,7 +173,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -303,8 +319,8 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -334,7 +350,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "nixvim", "nixpkgs" @@ -359,6 +375,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "neovim-nightly-overlay", @@ -380,7 +418,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -514,25 +552,27 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1725814101, - "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", - "ref": "refs/tags/v0.43.0", - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", - "revCount": 5196, + "lastModified": 1732052838, + "narHash": "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY=", + "ref": "refs/tags/v0.45.2", + "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a", + "revCount": 5451, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" }, "original": { - "ref": "refs/tags/v0.43.0", + "ref": "refs/tags/v0.45.2", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" @@ -542,21 +582,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -715,7 +753,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", @@ -823,6 +861,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1666753130, @@ -952,7 +1006,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", @@ -1037,6 +1091,30 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -1241,7 +1319,10 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 1ed6a09..12b4986 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ hyprland = { type = "git"; url = "https://github.com/hyprwm/Hyprland.git"; - ref = "refs/tags/v0.43.0"; + ref = "refs/tags/v0.45.2"; submodules = true; }; nix-colors.url = "github:misterio77/nix-colors"; diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 3c732bc..24383fb 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -51,7 +51,7 @@ in let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-rDWxVY9NqeMs/BhShf4a0++KCPCgPmy2QPFehBvsmnk="; + sha256 = "sha256-v0WtkeIENYjPnHjRUkhfKkEMTa/0DGF6qA6+jBsx+B0="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/common/features/wayland.nix b/hosts/common/features/wayland.nix index 3ee00a6..9add8c6 100644 --- a/hosts/common/features/wayland.nix +++ b/hosts/common/features/wayland.nix @@ -18,4 +18,9 @@ in }; }; }; + + nix.settings = { + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + }; } diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 4aa1e37..3d2ddff 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -50,7 +50,7 @@ in let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-rDWxVY9NqeMs/BhShf4a0++KCPCgPmy2QPFehBvsmnk="; + sha256 = "sha256-v0WtkeIENYjPnHjRUkhfKkEMTa/0DGF6qA6+jBsx+B0="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); From 75c342b39242f264fb589a73211556a55f24aec8 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sun, 5 Jan 2025 09:01:17 +0000 Subject: [PATCH 11/13] wip --- home/common/programs/hyprland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 5c01c85..97435f2 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -92,7 +92,7 @@ in }; env = [ - "GDK_SCALE, 2" + "GDK_SCALE, 1.5" "XCURSOR_SIZE, 32" "HYPRCURSOR_THEME, rose-pine-hyprcursor" "HYPRCURSOR_SIZE, 24" From 4e6b6a09800e18618c703a742ee3c47e3583baf8 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sun, 5 Jan 2025 09:19:37 +0000 Subject: [PATCH 12/13] wip --- flake.lock | 835 ++++++++++++++++---------------------- hosts/arrakis/default.nix | 2 +- 2 files changed, 353 insertions(+), 484 deletions(-) diff --git a/flake.lock b/flake.lock index f5d8c4f..6649c9d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,53 +2,45 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs_4", - "systems": "systems_2" + "astal": "astal", + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] }, "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", - "owner": "Aylur", + "lastModified": 1735485506, + "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=", + "owner": "aylur", "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "rev": "251d39413543264361898b02035775aa3e46fe52", "type": "github" }, "original": { - "owner": "Aylur", + "owner": "aylur", "repo": "ags", "type": "github" } }, - "aquamarine": { + "astal": { "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], "nixpkgs": [ - "hyprland", + "hyprpanel", + "ags", "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" ] }, "locked": { - "lastModified": 1725199881, - "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "owner": "aylur", + "repo": "astal", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "aquamarine", + "owner": "aylur", + "repo": "astal", "type": "github" } }, @@ -69,12 +61,21 @@ } }, "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1733001911, - "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", + "lastModified": 1735937475, + "narHash": "sha256-TYs1HHBRfCBb3aAak1bJ9087gX9DeYLGy69Dkiz9WdE=", "owner": "catppuccin", "repo": "nix", - "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", + "rev": "07f97a4990c138032a594b830bb02fd5dcf91ec2", "type": "github" }, "original": { @@ -83,6 +84,34 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -106,16 +135,16 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733390410, - "narHash": "sha256-bM3FIksaYkRloRh3y6GzuUrsJB7EizYtzeCgyftQ9rc=", + "lastModified": 1735963397, + "narHash": "sha256-z+yHxvZfWqFWUs0X6vrdUZlUrK9Q1MYPjHYmd6OdlkY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5f39164f253794b0101d596b7d4a7a0253f4b762", + "rev": "7ef40f138ae24f3b89a0e13dbad5bc9779007d85", "type": "gitlab" }, "original": { @@ -126,22 +155,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -157,7 +170,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -173,7 +186,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -195,11 +208,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -237,11 +250,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -251,6 +264,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -265,7 +296,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -280,9 +311,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -300,15 +331,15 @@ }, "foundry": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733389821, - "narHash": "sha256-stiL/HTX6GJz/M9wtOfFum4SEc9i1AtguOYjkbUQscI=", + "lastModified": 1735895415, + "narHash": "sha256-so5F648rlOYrRv7qhDFguZhm8XxFKyKjmQHzPAH27N0=", "owner": "shazow", "repo": "foundry.nix", - "rev": "6edd3054bde0967683a1c2d94907a84e778dc295", + "rev": "f076f9e98e51c10c62cfaf6eba6db9af84f4562a", "type": "github" }, "original": { @@ -319,23 +350,19 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -350,7 +377,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -361,11 +388,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -375,28 +402,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "neovim-nightly-overlay", @@ -418,7 +423,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -442,11 +447,11 @@ }, "hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -465,11 +470,11 @@ ] }, "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "lastModified": 1735695978, + "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", "type": "github" }, "original": { @@ -481,15 +486,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "catppuccin", "nixpkgs" ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -498,7 +504,49 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735947440, + "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -506,11 +554,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -519,126 +567,13 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1732052838, - "narHash": "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY=", - "ref": "refs/tags/v0.45.2", - "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a", - "revCount": 5451, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland.git" - }, - "original": { - "ref": "refs/tags/v0.45.2", - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland.git" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1725188252, - "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "nixpkgs": [ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709914708, @@ -657,14 +592,14 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1730628553, - "narHash": "sha256-yfPRDXpOjqXic7sPHkB3eW0HcsIsPhiZ+BIPFvt4JQs=", + "lastModified": 1735894462, + "narHash": "sha256-4+ogUuo7eRBqrpUISEUeqBDC6g034f2Lf0MNueyDhMs=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "9287e1d6a40d5aaa7ae0a8f38623327241f03e6f", + "rev": "d46e7ff417a154ce4f85d629b32b80e5973e7b90", "type": "github" }, "original": { @@ -673,57 +608,35 @@ "type": "github" } }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1724966483, - "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -753,19 +666,20 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733385688, - "narHash": "sha256-jbQXC1STBBX/APf02PFEFCC4w1IRUr7uow++VpPEYUY=", + "lastModified": 1735949516, + "narHash": "sha256-vQhyESogI5I/3eoOKgjHWRU5wHhvgrbcZjNpt+4dGY4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f12eb4fd26fd545f50ccb43637f9f72e4a0ef490", + "rev": "052254175793d6019abcb7e01723c8ba297fe662", "type": "github" }, "original": { @@ -777,11 +691,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733329564, - "narHash": "sha256-TAruRTODE/Om/EGOZwPaEPNY6DlgeB6hdYQNSyGNIHk=", + "lastModified": 1735929980, + "narHash": "sha256-vtnUEiVt9QtwUJTi/Vr8fCy+yAhYjY9BdLlsaDVrObc=", "owner": "neovim", "repo": "neovim", - "rev": "8f84167c30692555d3332565605e8a625aebc43c", + "rev": "a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0", "type": "github" }, "original": { @@ -817,11 +731,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -832,16 +746,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627814220, - "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", - "owner": "nixos", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -863,21 +777,37 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1627814220, + "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1666753130, "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", @@ -891,33 +821,17 @@ "type": "indirect" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_4": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -925,27 +839,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "lastModified": 1735821806, + "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "rev": "d6973081434f88088e5321f83ebafe9a1167c367", "type": "github" }, "original": { @@ -955,13 +853,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -971,23 +869,23 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_8": { - "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -1006,21 +904,21 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1733369744, - "narHash": "sha256-b2atMLs0myUiD5qnIxEko/gO/+ViNOGLNZnUFnYQ3bM=", + "lastModified": 1734567959, + "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=", "owner": "nix-community", "repo": "nixvim", - "rev": "38885227461de58a712362c1c484803d6c90a8b2", + "rev": "37608b462772e35220e02bfbd9045d0946564436", "type": "github" }, "original": { @@ -1029,21 +927,44 @@ "type": "github" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx", + "flake-utils": "flake-utils_4", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -1055,11 +976,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1733233534, - "narHash": "sha256-LD7b4v8cIQ6xh+5jYGdXMwrWPCx9axe8bRIyyAxZfVs=", + "lastModified": 1734449606, + "narHash": "sha256-NqJNb1z1STVxBDggqC3zGYabHl71KUnhCCIGMq17HDM=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "3dd6ed2d3f5ce4acce10919aae56f632bb6f32c3", + "rev": "ff4b0e2039d65e2a525bd6af58878d83fcb3dab5", "type": "github" }, "original": { @@ -1078,11 +999,11 @@ ] }, "locked": { - "lastModified": 1733317423, - "narHash": "sha256-duLKUBfQbZ8L/Oq4YiMU9DMjXQWu5q3jSIb6L7BPPgM=", + "lastModified": 1735965020, + "narHash": "sha256-lWjlFGMjEaReTiOiUZQMP8ihJvC2ofa3blEzXE3j2vs=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "1e9acb02bdc8d72804338bce6f960b15b0a06a5b", + "rev": "acd3e56e1dc399b2e05441cc0e10b7f33f122ccf", "type": "github" }, "original": { @@ -1091,54 +1012,29 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", "firefox-addons": "firefox-addons", "foundry": "foundry", "hardware": "hardware", - "home-manager": "home-manager", - "hyprland": "hyprland", + "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_6", + "systems": "systems_5", "utils": "utils_2" } }, "rose-pine-hyprcursor": { "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_9", + "hyprlang": "hyprlang", + "nixpkgs": "nixpkgs_8", "utils": "utils" }, "locked": { @@ -1157,65 +1053,50 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_4": { - "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_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1230,7 +1111,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1245,7 +1126,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1261,6 +1142,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -1268,11 +1170,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -1283,7 +1185,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -1301,7 +1203,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -1316,39 +1218,6 @@ "repo": "flake-utils", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1725203932, - "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index aa1e5cd..d546348 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -47,7 +47,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-v0WtkeIENYjPnHjRUkhfKkEMTa/0DGF6qA6+jBsx+B0="; + sha256 = "sha256-xVrGO4Cultc3tPcnLFKLa98btLh7EAl3tLM1MTvwmn8="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); From 0a767a73282d3311d221903d1bd829ed5d69afd2 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sun, 5 Jan 2025 09:32:16 +0000 Subject: [PATCH 13/13] wip --- home/arrakis/default.nix | 4 ++++ home/common/programs/hyprland/default.nix | 1 - home/desktop/default.nix | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index a70a0dc..4afe15f 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -37,6 +37,10 @@ "move cursor -50% -50%, class:thunar" "size 800 600, class:thunar" ]; + + env = [ + "GDK_SCALE, 1.5" + ]; }; programs.kitty.settings.font_size = 12; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 74b0821..8024d22 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -68,7 +68,6 @@ in }; env = [ - "GDK_SCALE, 1.5" "XCURSOR_SIZE, 32" "HYPRCURSOR_THEME, rose-pine-hyprcursor" "HYPRCURSOR_SIZE, 24" diff --git a/home/desktop/default.nix b/home/desktop/default.nix index fc55265..a802296 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -45,6 +45,10 @@ "move 100%-800 100%-800, class:ethui" "noinitialfocus, class:ethui" ]; + + env = [ + "GDK_SCALE, 2" + ]; }; programs.kitty.settings.font_size = 12;