From c5303302f4d763db727293447f366a3954412d3d Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 29 Nov 2024 11:11:46 +0000 Subject: [PATCH 01/21] Adding desktop config --- flake.lock | 158 +++++++++++----------- home/common/programs/hyprland/default.nix | 35 +++-- home/common/programs/kitty.nix | 7 +- home/common/programs/zsh.nix | 1 + home/desktop/default.nix | 2 +- home/desktop/monitors.nix | 30 ++++ hosts/desktop/hardware-configuration.nix | 54 +++++--- 7 files changed, 176 insertions(+), 111 deletions(-) create mode 100644 home/desktop/monitors.nix diff --git a/flake.lock b/flake.lock index ff06e21..1e8719c 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1732838231, + "narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1730635639, - "narHash": "sha256-B3PP5BGzu1PVb2e978uXj+7gWRJMHUAE5eUXxyHTxHQ=", + "lastModified": 1732852996, + "narHash": "sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "178c79df993216cc9be02630d6cf42868b29f9c2", + "rev": "0c855b6e0c58aef81f66c52f987f4c5ce8d48af0", "type": "gitlab" }, "original": { @@ -128,11 +128,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "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": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -346,11 +346,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": { @@ -405,11 +405,11 @@ }, "hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -428,11 +428,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1732793095, + "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -623,11 +623,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730628553, - "narHash": "sha256-yfPRDXpOjqXic7sPHkB3eW0HcsIsPhiZ+BIPFvt4JQs=", + "lastModified": 1732776432, + "narHash": "sha256-WuE4suVoWL5asL0HrW+vbMbONb1WeCBRZv8SDiTtz/I=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "9287e1d6a40d5aaa7ae0a8f38623327241f03e6f", + "rev": "56c94166446c2cf8546f1e7f642ea0306c468e3a", "type": "github" }, "original": { @@ -700,16 +700,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" } @@ -724,11 +724,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1730088025, - "narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=", + "lastModified": 1732864781, + "narHash": "sha256-EZTMM8MqMw4a/gVfg0T69uAh76KMRdj/0vOhEoqVZXc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f35afbe60a4ff71fd65fec3839fc38943f961951", + "rev": "3bb3b28e072e0e1995ae67b76d70e475c9599b90", "type": "github" }, "original": { @@ -740,11 +740,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1732810107, + "narHash": "sha256-7/pNOWesVpmFFM8o1aNqALBJ8NgodPZAe4gkOnFWS7E=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "146b8300a145efa64e579527da8606546a36162b", "type": "github" }, "original": { @@ -780,11 +780,11 @@ ] }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -872,11 +872,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -888,11 +888,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { @@ -904,11 +904,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -920,11 +920,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -963,11 +963,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730569492, - "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=", + "lastModified": 1732838896, + "narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce", + "rev": "05331006a42846d6e55129b642485f45f90c9efc", "type": "github" }, "original": { @@ -986,11 +986,11 @@ ] }, "locked": { - "lastModified": 1730515563, - "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -1002,11 +1002,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1731410731, - "narHash": "sha256-g9rA4Sd6vXCPf0nMimq0eqSYbEy8suKbtJ7HwRBt2zQ=", + "lastModified": 1732833034, + "narHash": "sha256-kr/5YUzFHKUHZbCFDaYY1pW1yL30pKdWsc/ekAJGFco=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "0c20f410afc8a2156488a7c7ae73a242bfa7e106", + "rev": "3a761f738c9437725b117fc644673057e37ef6e3", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1730543154, - "narHash": "sha256-r12a4K6sZaTcmj4cu+ClDern7JMP/k/O82ZBCrgfXog=", + "lastModified": 1732768408, + "narHash": "sha256-Eep/vmKujXy7lopSdisDjGXOesxWLqF/euRkPBpaHtc=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "9d7eabd828eb01d9bb0968a5b901683a5da4a3ff", + "rev": "877ba899e2a88872171340660fa2abe075b21a0e", "type": "github" }, "original": { @@ -1191,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732643199, + "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", "type": "github" }, "original": { @@ -1227,11 +1227,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": { diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index d5fe280..c167535 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -31,9 +31,9 @@ in new_optimizations = "on"; }; - drop_shadow = "yes"; - shadow_range = 2; - shadow_render_power = 1; + shadow = { + enabled = false; + }; }; input = { @@ -54,14 +54,20 @@ in }; general = { - gaps_in = 2; + border_size = 0; + gaps_in = 0; 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; + force_default_wallpaper = 0; + }; + + 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" ]; @@ -180,4 +187,12 @@ in ]; }; }; + + services.hyprpaper = { + enable = true; + settings = { + ipc = "off"; + 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/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..7127891 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 + ./wallpaper.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/desktop/monitors.nix b/home/desktop/monitors.nix new file mode 100644 index 0000000..bcb69d0 --- /dev/null +++ b/home/desktop/monitors.nix @@ -0,0 +1,30 @@ +{ + inputs, + pkgs, + config, +}: +let + wallpaper1 = pkgs.fetchurl { + url = "https://i.redd.it/mvev8aelh7zc1.png"; + hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w"; + }; +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.wallpapers = [ + "DP-1, ${builtins.toString wallpaper1}" + "HDMI-A-1, ${builtins.toString wallpaper1}" + ]; +} 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 ba03c899b9a138cd66067fe68d09217b6f80a67f Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 29 Nov 2024 11:12:05 +0000 Subject: [PATCH 02/21] wip --- home/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 7127891..a70a0dc 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -21,7 +21,7 @@ ../common/features/colorscheme.nix ../common/features/xdg.nix ../common/features/bluetooth.nix - ./wallpaper.nix + ./monitors.nix ]; home.sessionVariables = { From 4f3d23c9506fe07351bce2b694fe18136e1c00ac Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 29 Nov 2024 11:12:47 +0000 Subject: [PATCH 03/21] wip --- home/desktop/monitors.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix index bcb69d0..19db84f 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -10,18 +10,18 @@ let }; 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" - ]; - }; + # 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.wallpapers = [ "DP-1, ${builtins.toString wallpaper1}" From 5d4f0ea9593e207e8af89c25e169b263f01f6a03 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 29 Nov 2024 22:24:43 +0000 Subject: [PATCH 04/21] hyprland tweaks --- home/common/programs/hyprland/default.nix | 8 ++--- home/desktop/default.nix | 8 +++++ home/desktop/monitors.nix | 36 ++++++++++++----------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index c167535..209a8f1 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -32,7 +32,8 @@ in }; shadow = { - enabled = false; + range = 2; + render_power = 4; }; }; @@ -55,14 +56,13 @@ in general = { border_size = 0; - gaps_in = 0; + gaps_in = 4; gaps_out = 0; }; misc = { disable_hyprland_logo = true; disable_splash_rendering = true; - force_default_wallpaper = 0; }; xwayland = { @@ -191,7 +191,7 @@ in services.hyprpaper = { enable = true; settings = { - ipc = "off"; + ipc = "on"; splash = false; }; }; diff --git a/home/desktop/default.nix b/home/desktop/default.nix index a70a0dc..fc55265 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -33,9 +33,17 @@ wayland.windowManager.hyprland.settings = { 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 index 19db84f..e60af61 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -2,29 +2,31 @@ inputs, pkgs, config, + ... }: let wallpaper1 = pkgs.fetchurl { - url = "https://i.redd.it/mvev8aelh7zc1.png"; - hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w"; + 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" - # ]; - # }; + 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.wallpapers = [ - "DP-1, ${builtins.toString wallpaper1}" - "HDMI-A-1, ${builtins.toString wallpaper1}" + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "DP-1,${builtins.toString wallpaper1}" + "HDMI-A-1,${builtins.toString wallpaper1}" ]; } From e1aaade858713bd5541a2c0256c3276a9c0f77ac Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 30 Nov 2024 09:18:24 +0000 Subject: [PATCH 05/21] Using foundry nightly --- flake.lock | 49 +++++++++++++++++------------------ flake.nix | 2 +- home/common/programs/rust.nix | 5 ++-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 1e8719c..833b107 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732838231, - "narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=", + "lastModified": 1732947104, + "narHash": "sha256-AMVSa4H73IAp12Zwpa+2/mE9sFirxxg8gv6gDvADzQI=", "owner": "catppuccin", "repo": "nix", - "rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115", + "rev": "7a6e695bbf6220af2b1a6941613d9df1160a32cd", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732852996, - "narHash": "sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM=", + "lastModified": 1732939398, + "narHash": "sha256-fz8GXwXgvRwFsKYb0TNungjbKv/KxpbMWFjWz/c0OlA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0c855b6e0c58aef81f66c52f987f4c5ce8d48af0", + "rev": "63e16a9448014071e78224afe0d6157a47fe4f2b", "type": "gitlab" }, "original": { @@ -288,16 +288,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730625090, - "narHash": "sha256-lWfkkj+GEUM0UqYLD2Rx3zzILTL3xdmGJKGR4fwONpA=", + "lastModified": 1732871423, + "narHash": "sha256-nAfPeLqz8ihwmvRHVxQRbMJ3F9Hh+jGubK1Yz4bkM0o=", "owner": "shazow", "repo": "foundry.nix", - "rev": "1c6a742bcbfd55a80de0e1f967a60174716a1560", + "rev": "93094a90eb8b4a121b9f33411a8d05319b0e7fd7", "type": "github" }, "original": { "owner": "shazow", - "ref": "monthly", "repo": "foundry.nix", "type": "github" } @@ -448,11 +447,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -724,11 +723,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1732864781, - "narHash": "sha256-EZTMM8MqMw4a/gVfg0T69uAh76KMRdj/0vOhEoqVZXc=", + "lastModified": 1732925246, + "narHash": "sha256-MjqyzOEa6s9OGO8SMh5C2kqo57+iSNsgDbzPBbpi4QU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3bb3b28e072e0e1995ae67b76d70e475c9599b90", + "rev": "7461a0b228bb48bb02af086f8b9ee9a83583120b", "type": "github" }, "original": { @@ -740,11 +739,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732810107, - "narHash": "sha256-7/pNOWesVpmFFM8o1aNqALBJ8NgodPZAe4gkOnFWS7E=", + "lastModified": 1732903628, + "narHash": "sha256-JF8zmoLdqmbKCSS5Smf/Yj0jEl5f+qKhSubhPo/BvUM=", "owner": "neovim", "repo": "neovim", - "rev": "146b8300a145efa64e579527da8606546a36162b", + "rev": "2833925cfc688786759d6a980a1ad62b62d20570", "type": "github" }, "original": { @@ -904,11 +903,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -1002,11 +1001,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1732833034, - "narHash": "sha256-kr/5YUzFHKUHZbCFDaYY1pW1yL30pKdWsc/ekAJGFco=", + "lastModified": 1732919897, + "narHash": "sha256-c62AkM52y6LKhuTrq7Nr0LIX7xDGqF1bWXLmp58Oc7U=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "3a761f738c9437725b117fc644673057e37ef6e3", + "rev": "39bfb4e11e04158bb280d3b6262d4a2d5faee24e", "type": "github" }, "original": { 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"; 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" ]; }; } From 24ffe7b98570352a1b5cb7acac3d8d4965c2a6b8 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Mon, 2 Dec 2024 14:04:15 +0000 Subject: [PATCH 06/21] nm-applet --- flake.lock | 162 +++++++++++------------ home/common/programs/desktop/default.nix | 1 + 2 files changed, 82 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 833b107..e273fc8 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732947104, - "narHash": "sha256-AMVSa4H73IAp12Zwpa+2/mE9sFirxxg8gv6gDvADzQI=", + "lastModified": 1733001911, + "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "owner": "catppuccin", "repo": "nix", - "rev": "7a6e695bbf6220af2b1a6941613d9df1160a32cd", + "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732939398, - "narHash": "sha256-fz8GXwXgvRwFsKYb0TNungjbKv/KxpbMWFjWz/c0OlA=", + "lastModified": 1733133520, + "narHash": "sha256-uL/tr4wvU8Mw6w24eUbvI4K3agkYpjSyx5AXSD3HeeQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "63e16a9448014071e78224afe0d6157a47fe4f2b", + "rev": "0a27826b2f604fde841eab480a02caa144ac4d07", "type": "gitlab" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732871423, - "narHash": "sha256-nAfPeLqz8ihwmvRHVxQRbMJ3F9Hh+jGubK1Yz4bkM0o=", + "lastModified": 1733130636, + "narHash": "sha256-Rs/kLwUM3tGOdWLPsHjfbwd1R0Rh4Y33+1hUQ68AimQ=", "owner": "shazow", "repo": "foundry.nix", - "rev": "93094a90eb8b4a121b9f33411a8d05319b0e7fd7", + "rev": "a919ea688a8dd215d8aeae5c07f71ec0ae7854c3", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733066523, + "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733133928, + "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1732776432, - "narHash": "sha256-WuE4suVoWL5asL0HrW+vbMbONb1WeCBRZv8SDiTtz/I=", + "lastModified": 1733062031, + "narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "56c94166446c2cf8546f1e7f642ea0306c468e3a", + "rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", "type": "github" }, "original": { @@ -723,11 +723,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1732925246, - "narHash": "sha256-MjqyzOEa6s9OGO8SMh5C2kqo57+iSNsgDbzPBbpi4QU=", + "lastModified": 1733098025, + "narHash": "sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0+Ev6h8T3k=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7461a0b228bb48bb02af086f8b9ee9a83583120b", + "rev": "73ec92a4c2773ead4af1c657ea81142d4a27fe78", "type": "github" }, "original": { @@ -739,11 +739,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732903628, - "narHash": "sha256-JF8zmoLdqmbKCSS5Smf/Yj0jEl5f+qKhSubhPo/BvUM=", + "lastModified": 1733090308, + "narHash": "sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k=", "owner": "neovim", "repo": "neovim", - "rev": "2833925cfc688786759d6a980a1ad62b62d20570", + "rev": "feb62d5429680278c1353c565db6bb3ecb3b7c24", "type": "github" }, "original": { @@ -779,11 +779,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -870,38 +870,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1732617236, - "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1732758367, "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", @@ -917,13 +885,45 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733024928, + "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "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_8": { + "locked": { + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -962,11 +962,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732838896, - "narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=", + "lastModified": 1733132296, + "narHash": "sha256-fYEf0IgsNJp/hcb+C3FKtJvVabPDQs64hdL0izNBwXc=", "owner": "nix-community", "repo": "nixvim", - "rev": "05331006a42846d6e55129b642485f45f90c9efc", + "rev": "e680b367c726e2ae37d541328fe81f8daaf49a6c", "type": "github" }, "original": { @@ -985,11 +985,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1732919897, - "narHash": "sha256-c62AkM52y6LKhuTrq7Nr0LIX7xDGqF1bWXLmp58Oc7U=", + "lastModified": 1733005545, + "narHash": "sha256-LD7b4v8cIQ6xh+5jYGdXMwrWPCx9axe8bRIyyAxZfVs=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "39bfb4e11e04158bb280d3b6262d4a2d5faee24e", + "rev": "58775799e573536a06c14ea703e6d788cc39e129", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1732768408, - "narHash": "sha256-Eep/vmKujXy7lopSdisDjGXOesxWLqF/euRkPBpaHtc=", + "lastModified": 1733043821, + "narHash": "sha256-Ov+AqhVcHeop8t+hFG9/dUQvY5zC1VoEget6PpBC2Mo=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "877ba899e2a88872171340660fa2abe075b21a0e", + "rev": "32150764208602cb6104aecd73effd16176364b2", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index d4e049a..9a294ae 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -18,6 +18,7 @@ pavucontrol zathura lxappearance + networkmanagerapplet # communication slack From bb744d62a9f994f450b5fac8a476335db1108da0 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Wed, 4 Dec 2024 11:13:08 +0000 Subject: [PATCH 07/21] flake update --- flake.lock | 22 +++++++++++----------- home/common/programs/git/default.nix | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index e273fc8..da0d20a 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733133520, - "narHash": "sha256-uL/tr4wvU8Mw6w24eUbvI4K3agkYpjSyx5AXSD3HeeQ=", + "lastModified": 1733135686, + "narHash": "sha256-++1Btq9w+ZPQYP45X3G1iXEXwllo3b2UdeKVwQdUAoQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0a27826b2f604fde841eab480a02caa144ac4d07", + "rev": "074cadca26132cbd19f44ae5a45072f28f050ed9", "type": "gitlab" }, "original": { @@ -404,11 +404,11 @@ }, "hardware": { "locked": { - "lastModified": 1733066523, - "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", + "lastModified": 1733139194, + "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", + "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1733005545, + "lastModified": 1733233534, "narHash": "sha256-LD7b4v8cIQ6xh+5jYGdXMwrWPCx9axe8bRIyyAxZfVs=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "58775799e573536a06c14ea703e6d788cc39e129", + "rev": "3dd6ed2d3f5ce4acce10919aae56f632bb6f32c3", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1733043821, - "narHash": "sha256-Ov+AqhVcHeop8t+hFG9/dUQvY5zC1VoEget6PpBC2Mo=", + "lastModified": 1733140987, + "narHash": "sha256-4NJx32wcV8zLc45Yqs/v4H4MKzz5UX9X3dq6iOfUULw=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "32150764208602cb6104aecd73effd16176364b2", + "rev": "5885fca7133c563af1ccc2e5faa028751671c1ef", "type": "github" }, "original": { 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"; From 6386163418eafbb32d36ece9d48a33bd499433b1 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 10:30:55 +0000 Subject: [PATCH 08/21] adding some network utils --- home/common/programs/desktop/default.nix | 4 ++++ home/common/programs/hyprland/default.nix | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index 9a294ae..0b7ca9f 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -18,7 +18,11 @@ pavucontrol zathura lxappearance + + # networking networkmanagerapplet + mtr + dnsutils # communication slack diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 209a8f1..7af26ee 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -31,10 +31,10 @@ in new_optimizations = "on"; }; - shadow = { - range = 2; - render_power = 4; - }; + # shadow = { + # range = 2; + # render_power = 4; + # }; }; input = { From 4e99d2352c32730be778dd3bc30fc8f4fc0cd10f Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 10:32:21 +0000 Subject: [PATCH 09/21] arrakis wallpaper --- home/arrakis/default.nix | 2 +- home/arrakis/monitors.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 home/arrakis/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..b36f5ab --- /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, auto, bitdepth, 8" + ]; + }; + + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "eDP-1,${builtins.toString wallpaper1}" + ]; +} From 5aaeefab69e3047c58e984b02078be477eae49d7 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 10:33:00 +0000 Subject: [PATCH 10/21] nm-applet --- home/common/programs/hyprland/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 7af26ee..5c01c85 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -101,6 +101,7 @@ in "exec-once" = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "hyprpanel" + "nm-applet" ]; windowrulev2 = [ From b1f443db0ec61c22a005dfc2ce6f912bb7c426d7 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 20 Dec 2024 11:31:05 +0000 Subject: [PATCH 11/21] updates --- flake.lock | 12 ++++++------ home/common/programs/kitty.nix | 4 ++-- hosts/common/features/fonts.nix | 10 ++-------- hosts/desktop/default.nix | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index da0d20a..7d1d379 100644 --- a/flake.lock +++ b/flake.lock @@ -903,11 +903,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1001,11 +1001,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": { diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix index 138b363..066e182 100644 --- a/home/common/programs/kitty.nix +++ b/home/common/programs/kitty.nix @@ -10,8 +10,8 @@ enabled_layouts = "tall, grid, fat, splits"; # font - font_family = "FiraCode Nerd Font Regular"; - bold_font = "FiraCode Nerd Font Bold"; + font_family = "FiraCode Nerd Font Mono"; + bold_font = "FiraCode Nerd Font Mono Bold"; italic_font = "VictorMono Nerd Font Mono Oblique"; bold_italic_font = "VictorMono Nerd Font Mono Bold Oblique"; disable_ligatures = "cursor"; diff --git a/hosts/common/features/fonts.nix b/hosts/common/features/fonts.nix index 3c069e2..50c0084 100644 --- a/hosts/common/features/fonts.nix +++ b/hosts/common/features/fonts.nix @@ -10,15 +10,9 @@ packages = with pkgs; [ ubuntu_font_family libertine - fira-code - fira-code-symbols + nerd-fonts.fira-code + nerd-fonts.victor-mono roboto - (nerdfonts.override { - fonts = [ - "FiraCode" - "VictorMono" - ]; - }) ]; fontconfig = { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 4aa1e37..00ba948 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-xVrGO4Cultc3tPcnLFKLa98btLh7EAl3tLM1MTvwmn8="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); From 770e6ce299fdb02e204c36166fc31e4b45787912 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 20 Dec 2024 11:35:24 +0000 Subject: [PATCH 12/21] updates --- flake.lock | 170 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 96 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 7d1d379..1ab3420 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1733001911, - "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", + "lastModified": 1734671418, + "narHash": "sha256-K2Su5hM1nEIgKJ55TB5W+UfN9zBHUxC0SjWAtjXLEnI=", "owner": "catppuccin", "repo": "nix", - "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", + "rev": "6239449c96569547af621899f44a5ea333cb2576", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733135686, - "narHash": "sha256-++1Btq9w+ZPQYP45X3G1iXEXwllo3b2UdeKVwQdUAoQ=", + "lastModified": 1734648163, + "narHash": "sha256-AK7nqONfzyxUzqVVeRoniO6NRv4SaxPrXwuyY8jtCXs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "074cadca26132cbd19f44ae5a45072f28f050ed9", + "rev": "2b5a7eb2719b146f6308dfa51c9a1c4b03d965a3", "type": "gitlab" }, "original": { @@ -128,11 +128,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1732722421, - "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -179,11 +179,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": { @@ -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": { @@ -221,11 +221,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": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733130636, - "narHash": "sha256-Rs/kLwUM3tGOdWLPsHjfbwd1R0Rh4Y33+1hUQ68AimQ=", + "lastModified": 1734685808, + "narHash": "sha256-orRFhQZTvK4/DTuY5PyKkXwTBjB5lbgohkdFY2byBAA=", "owner": "shazow", "repo": "foundry.nix", - "rev": "a919ea688a8dd215d8aeae5c07f71ec0ae7854c3", + "rev": "81a25fd291cbff6bc74f9568134fc3929f3bf74b", "type": "github" }, "original": { @@ -315,11 +315,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": { @@ -345,11 +345,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": { @@ -404,11 +404,11 @@ }, "hardware": { "locked": { - "lastModified": 1733139194, - "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -427,11 +427,11 @@ ] }, "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1733133928, - "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -720,14 +720,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_6", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733098025, - "narHash": "sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0+Ev6h8T3k=", + "lastModified": 1734679226, + "narHash": "sha256-suZLxqPd9+Eg3/aWSWmVEwDi4uMOd6c2CeseZu9Nw5M=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "73ec92a4c2773ead4af1c657ea81142d4a27fe78", + "rev": "d3963249e534e247041862b8162fb738c8604d3a", "type": "github" }, "original": { @@ -739,11 +740,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733090308, - "narHash": "sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k=", + "lastModified": 1734620824, + "narHash": "sha256-1DYP7gnHmD841k+JbHv9HfyBsB8Eq5M9VmAvbPpOK0U=", "owner": "neovim", "repo": "neovim", - "rev": "feb62d5429680278c1353c565db6bb3ecb3b7c24", + "rev": "8ef41f590224dfeea2e51d9fec150e363fd72ee0", "type": "github" }, "original": { @@ -779,11 +780,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": { @@ -887,11 +888,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1733024928, - "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { @@ -903,11 +904,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -919,11 +920,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -959,14 +960,14 @@ "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1733132296, - "narHash": "sha256-fYEf0IgsNJp/hcb+C3FKtJvVabPDQs64hdL0izNBwXc=", + "lastModified": 1734567959, + "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=", "owner": "nix-community", "repo": "nixvim", - "rev": "e680b367c726e2ae37d541328fe81f8daaf49a6c", + "rev": "37608b462772e35220e02bfbd9045d0946564436", "type": "github" }, "original": { @@ -985,11 +986,11 @@ ] }, "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": { @@ -1024,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1733140987, - "narHash": "sha256-4NJx32wcV8zLc45Yqs/v4H4MKzz5UX9X3dq6iOfUULw=", + "lastModified": 1734614561, + "narHash": "sha256-ToUtmCNZpGCT0yldPkglcMoFovbJROelGm0m3lWjcR0=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "5885fca7133c563af1ccc2e5faa028751671c1ef", + "rev": "2451ed8781e20e06b35b2b2fae0c511b7dc0d663", "type": "github" }, "original": { @@ -1064,11 +1065,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": { @@ -1183,6 +1184,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734543842, + "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -1190,11 +1212,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": { From 757a25b168b8d5bd1eeff4caa88e8e4673e50c67 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 2 Jan 2025 16:35:40 +0000 Subject: [PATCH 13/21] Adding a few programs --- home/common/programs/desktop/default.nix | 2 ++ home/common/programs/hyprland/default.nix | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index 0b7ca9f..245fa75 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -18,6 +18,8 @@ pavucontrol zathura lxappearance + xournalpp + jq # networking networkmanagerapplet diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 5c01c85..ab10f95 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -14,6 +14,7 @@ in pamixer hyprshot hyprpanel + playerctl ]; home.sessionVariables = { @@ -170,9 +171,9 @@ in "$mod, mouse_up, workspace, e-1" # media - ", XF86AudioRaiseVolume, exec, volumectl -u up" - ", XF86AudioLowerVolume, exec, volumectl -u down" - ", XF86AudioMute, exec, volumectl toggle-mute" + ", XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%" + ", XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%" + ", XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle" ", XF86AudioMicMute, exec, volumectl -m toggle-mute" ", XF86AudioNext, exec, playerctl next" ", XF86AudioPrev, exec, playerctl previous" From c129b238f27a6dcbc9166c8f0d253a6cd68353b3 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 05:42:59 +0000 Subject: [PATCH 14/21] Updating nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1ab3420..d45f2dc 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { From 06f3893e86444a6082f57587f465d8cba9ccfc4b Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 05:45:50 +0000 Subject: [PATCH 15/21] nvim updates --- flake.lock | 542 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 367 insertions(+), 175 deletions(-) diff --git a/flake.lock b/flake.lock index d45f2dc..e5e1067 100644 --- a/flake.lock +++ b/flake.lock @@ -2,8 +2,8 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs_4", - "systems": "systems_2" + "nixpkgs": "nixpkgs_5", + "systems": "systems_3" }, "locked": { "lastModified": 1728326430, @@ -69,12 +69,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": 1734671418, - "narHash": "sha256-K2Su5hM1nEIgKJ55TB5W+UfN9zBHUxC0SjWAtjXLEnI=", + "lastModified": 1735937475, + "narHash": "sha256-TYs1HHBRfCBb3aAak1bJ9087gX9DeYLGy69Dkiz9WdE=", "owner": "catppuccin", "repo": "nix", - "rev": "6239449c96569547af621899f44a5ea333cb2576", + "rev": "07f97a4990c138032a594b830bb02fd5dcf91ec2", "type": "github" }, "original": { @@ -83,6 +92,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,8 +143,8 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "pkgs/firefox-addons", @@ -179,11 +216,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": { @@ -235,6 +272,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=", @@ -249,7 +304,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -264,9 +319,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -284,15 +339,15 @@ }, "foundry": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734685808, - "narHash": "sha256-orRFhQZTvK4/DTuY5PyKkXwTBjB5lbgohkdFY2byBAA=", + "lastModified": 1735895415, + "narHash": "sha256-so5F648rlOYrRv7qhDFguZhm8XxFKyKjmQHzPAH27N0=", "owner": "shazow", "repo": "foundry.nix", - "rev": "81a25fd291cbff6bc74f9568134fc3929f3bf74b", + "rev": "f076f9e98e51c10c62cfaf6eba6db9af84f4562a", "type": "github" }, "original": { @@ -308,18 +363,14 @@ "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -427,11 +478,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": { @@ -441,6 +492,49 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "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" @@ -460,7 +554,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -517,8 +611,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "systems": "systems", + "nixpkgs": "nixpkgs_4", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -600,7 +694,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1709914708, @@ -619,7 +713,7 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1733062031, @@ -686,6 +780,34 @@ } }, "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", @@ -720,15 +842,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734679226, - "narHash": "sha256-suZLxqPd9+Eg3/aWSWmVEwDi4uMOd6c2CeseZu9Nw5M=", + "lastModified": 1735949516, + "narHash": "sha256-vQhyESogI5I/3eoOKgjHWRU5wHhvgrbcZjNpt+4dGY4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d3963249e534e247041862b8162fb738c8604d3a", + "rev": "052254175793d6019abcb7e01723c8ba297fe662", "type": "github" }, "original": { @@ -740,11 +862,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1734620824, - "narHash": "sha256-1DYP7gnHmD841k+JbHv9HfyBsB8Eq5M9VmAvbPpOK0U=", + "lastModified": 1735929980, + "narHash": "sha256-vtnUEiVt9QtwUJTi/Vr8fCy+yAhYjY9BdLlsaDVrObc=", "owner": "neovim", "repo": "neovim", - "rev": "8ef41f590224dfeea2e51d9fec150e363fd72ee0", + "rev": "a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0", "type": "github" }, "original": { @@ -795,16 +917,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" } @@ -824,117 +946,23 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1666753130, - "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1734435836, - "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4989a246d7a390a859852baddb1013f825435cee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "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_9": { + "nixpkgs_10": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -950,15 +978,141 @@ "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=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { + "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_5": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1735821806, + "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d6973081434f88088e5321f83ebafe9a1167c367", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "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" + } + }, "nixvim": { "inputs": { "devshell": "devshell", "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_9", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -976,10 +1130,33 @@ "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" @@ -1025,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1734614561, - "narHash": "sha256-ToUtmCNZpGCT0yldPkglcMoFovbJROelGm0m3lWjcR0=", + "lastModified": 1735965020, + "narHash": "sha256-lWjlFGMjEaReTiOiUZQMP8ihJvC2ofa3blEzXE3j2vs=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "2451ed8781e20e06b35b2b2fae0c511b7dc0d663", + "rev": "acd3e56e1dc399b2e05441cc0e10b7f33f122ccf", "type": "github" }, "original": { @@ -1044,24 +1221,24 @@ "firefox-addons": "firefox-addons", "foundry": "foundry", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprpanel": "hyprpanel", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_6", + "systems": "systems_7", "utils": "utils_2" } }, "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "utils": "utils" }, "locked": { @@ -1080,16 +1257,16 @@ }, "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" } }, @@ -1110,20 +1287,35 @@ }, "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": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1138,7 +1330,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1153,7 +1345,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1168,7 +1360,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1191,11 +1383,11 @@ ] }, "locked": { - "lastModified": 1734543842, - "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { @@ -1227,7 +1419,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -1245,7 +1437,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, From 8fe6e0a0a26237dbb76a7401fc88c75cbdec144e Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 05:47:39 +0000 Subject: [PATCH 16/21] updating home-manager --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e5e1067..9cdf92a 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1734648163, - "narHash": "sha256-AK7nqONfzyxUzqVVeRoniO6NRv4SaxPrXwuyY8jtCXs=", + "lastModified": 1735963397, + "narHash": "sha256-z+yHxvZfWqFWUs0X6vrdUZlUrK9Q1MYPjHYmd6OdlkY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "2b5a7eb2719b146f6308dfa51c9a1c4b03d965a3", + "rev": "7ef40f138ae24f3b89a0e13dbad5bc9779007d85", "type": "gitlab" }, "original": { @@ -455,11 +455,11 @@ }, "hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1735947440, + "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327", "type": "github" }, "original": { From 86e247ff9ab690abf6bcc0fe8f455883e3c690f9 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 05:54:55 +0000 Subject: [PATCH 17/21] updating hyprpanel --- flake.lock | 166 ++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 86 deletions(-) diff --git a/flake.lock b/flake.lock index 9cdf92a..3108b34 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,22 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "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" } @@ -52,6 +55,28 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "owner": "aylur", + "repo": "astal", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -321,7 +346,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -694,7 +719,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1709914708, @@ -713,14 +738,14 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1733062031, - "narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", + "lastModified": 1735894462, + "narHash": "sha256-4+ogUuo7eRBqrpUISEUeqBDC6g034f2Lf0MNueyDhMs=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", + "rev": "d46e7ff417a154ce4f85d629b32b80e5973e7b90", "type": "github" }, "original": { @@ -842,7 +867,7 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -962,22 +987,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1627814220, @@ -1026,37 +1035,21 @@ }, "nixpkgs_5": { "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" } }, "nixpkgs_6": { - "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -1072,7 +1065,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1088,7 +1081,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1734424634, "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", @@ -1104,6 +1097,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -1112,7 +1121,7 @@ "git-hooks": "git-hooks_2", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -1226,19 +1235,19 @@ "hyprpanel": "hyprpanel", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_7", + "systems": "systems_6", "utils": "utils_2" } }, "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "utils": "utils" }, "locked": { @@ -1287,50 +1296,35 @@ }, "systems_3": { "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_4": { "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_5": { - "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_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1345,7 +1339,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1360,7 +1354,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1419,7 +1413,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -1437,7 +1431,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, From 2377731aa50b78fde5fe155351e2f726408ec14b Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 05:57:07 +0000 Subject: [PATCH 18/21] hyprland 0.44 --- flake.lock | 40 +++++++++++++++++++++++++++++++++------- flake.nix | 2 +- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 3108b34..8d5a1bc 100644 --- a/flake.lock +++ b/flake.lock @@ -633,6 +633,7 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -641,23 +642,48 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1725814101, - "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", - "ref": "refs/tags/v0.43.0", - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", - "revCount": 5196, + "lastModified": 1728478479, + "narHash": "sha256-hnoPoxMFetuoXQuAMgvopl1kCRQ33FYaVVBgV9FIFkM=", + "ref": "refs/tags/v0.44.1", + "rev": "4520b30d498daca8079365bdb909a8dea38e8d55", + "revCount": 5309, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" }, "original": { - "ref": "refs/tags/v0.43.0", + "ref": "refs/tags/v0.44.1", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" } }, "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735774328, + "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -1449,7 +1475,7 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 1ed6a09..7286495 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.44.1"; submodules = true; }; nix-colors.url = "github:misterio77/nix-colors"; From 3ac2348e17269e453f2c19860082cb0793e4b88a Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 06:01:29 +0000 Subject: [PATCH 19/21] cleanup old vars --- flake.lock | 122 +++++++++++++++++++++++++------------- flake.nix | 2 +- hosts/arrakis/default.nix | 4 -- hosts/desktop/default.nix | 4 -- hosts/trantor/default.nix | 4 -- 5 files changed, 81 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 8d5a1bc..33222c4 100644 --- a/flake.lock +++ b/flake.lock @@ -188,6 +188,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, @@ -203,7 +219,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -219,7 +235,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -383,8 +399,8 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -410,7 +426,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "nixvim", "nixpkgs" @@ -435,6 +451,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", @@ -456,7 +494,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -638,21 +676,22 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", + "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1728478479, - "narHash": "sha256-hnoPoxMFetuoXQuAMgvopl1kCRQ33FYaVVBgV9FIFkM=", - "ref": "refs/tags/v0.44.1", - "rev": "4520b30d498daca8079365bdb909a8dea38e8d55", - "revCount": 5309, + "lastModified": 1731162467, + "narHash": "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=", + "ref": "refs/tags/v0.45.0", + "rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf", + "revCount": 5433, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" }, "original": { - "ref": "refs/tags/v0.44.1", + "ref": "refs/tags/v0.45.0", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland.git" @@ -683,33 +722,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -888,7 +900,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", @@ -1142,7 +1154,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_3", @@ -1250,6 +1262,29 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -1475,7 +1510,10 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 7286495..48505ac 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.44.1"; + ref = "refs/tags/v0.45.0"; submodules = true; }; nix-colors.url = "github:misterio77/nix-colors"; diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 3c732bc..9263d63 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -4,10 +4,6 @@ config, ... }: -let - tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; -in { imports = [ ./hardware-configuration.nix diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 00ba948..9b178d9 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -4,10 +4,6 @@ config, ... }: -let - tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; -in { imports = [ ./hardware-configuration.nix diff --git a/hosts/trantor/default.nix b/hosts/trantor/default.nix index 5bd5e16..b474200 100644 --- a/hosts/trantor/default.nix +++ b/hosts/trantor/default.nix @@ -4,10 +4,6 @@ config, ... }: -let - tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; -in { imports = [ ./hardware-configuration.nix From 1ed8898ef43f78039768a2c04648056f66bb67fa Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 06:17:09 +0000 Subject: [PATCH 20/21] cleanup hyprland config --- home/common/programs/hyprland/default.nix | 42 ++++++----------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index ab10f95..85f76f5 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -24,31 +24,14 @@ in wayland.windowManager.hyprland = { enable = true; settings = { - decoration = { - blur = { - enabled = "yes"; - size = 30; - passes = 1; - new_optimizations = "on"; - }; - - # shadow = { - # range = 2; - # render_power = 4; - # }; - }; - input = { - kb_layout = "us"; kb_options = "ctrl:nocaps"; - follow_mouse = 1; repeat_delay = 150; - repeat_rate = 25; touchpad = { natural_scroll = "yes"; }; - numlock_by_default = "true"; + numlock_by_default = 2; }; cursor = { @@ -84,14 +67,6 @@ in }; - dwindle = { - preserve_split = "yes"; - }; - - master = { - orientation = "center"; - }; - env = [ "GDK_SCALE, 2" "XCURSOR_SIZE, 32" @@ -122,6 +97,7 @@ in ]; "$mod" = "SUPER"; + bind = [ "$mod, t, exec, kitty" "$mod, e, exec, thunar" @@ -170,16 +146,20 @@ in "$mod, mouse_down, workspace, e+1" "$mod, mouse_up, workspace, e-1" - # media - ", XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%" - ", XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%" + ]; + + bindel = [ + ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ", XF86MonBrightnessUp, exec, brightnessctl set 5%+" + ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" + ]; + bindl = [ ", XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle" ", XF86AudioMicMute, exec, volumectl -m toggle-mute" ", XF86AudioNext, exec, playerctl next" ", XF86AudioPrev, exec, playerctl previous" ", XF86AudioPlay, exec, playerctl play-pause" - ", XF86MonBrightnessUp, exec, brightnessctl set 5%+" - ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" ]; bindm = [ From 7b8bcf42ca9f8276f626ce77dc93f03eff5b0863 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 4 Jan 2025 06:18:39 +0000 Subject: [PATCH 21/21] removed hyprland input (unused) --- flake.lock | 392 +++++------------------------------------------------ flake.nix | 6 - 2 files changed, 35 insertions(+), 363 deletions(-) diff --git a/flake.lock b/flake.lock index 33222c4..6649c9d 100644 --- a/flake.lock +++ b/flake.lock @@ -22,39 +22,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1725199881, - "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -188,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, @@ -219,7 +170,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -235,7 +186,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -362,7 +313,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -399,8 +350,8 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -426,7 +377,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -451,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", @@ -494,7 +423,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -638,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_4", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1731162467, - "narHash": "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=", - "ref": "refs/tags/v0.45.0", - "rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf", - "revCount": 5433, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland.git" - }, - "original": { - "ref": "refs/tags/v0.45.0", - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland.git" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", - "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, @@ -776,7 +592,7 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1735894462, @@ -792,56 +608,6 @@ "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": [ @@ -900,12 +666,12 @@ }, "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": { @@ -1056,22 +822,6 @@ } }, "nixpkgs_4": { - "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_5": { "locked": { "lastModified": 1735291276, "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", @@ -1087,7 +837,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -1103,7 +853,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1119,7 +869,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1734424634, "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", @@ -1135,7 +885,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -1154,12 +904,12 @@ "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_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -1262,29 +1012,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -1292,23 +1019,22 @@ "foundry": "foundry", "hardware": "hardware", "home-manager": "home-manager_2", - "hyprland": "hyprland", "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": { @@ -1342,50 +1068,35 @@ }, "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=", @@ -1400,7 +1111,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1415,7 +1126,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1474,7 +1185,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -1492,7 +1203,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -1507,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/flake.nix b/flake.nix index 48505ac..2ac3153 100644 --- a/flake.nix +++ b/flake.nix @@ -15,12 +15,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - type = "git"; - url = "https://github.com/hyprwm/Hyprland.git"; - ref = "refs/tags/v0.45.0"; - submodules = true; - }; nix-colors.url = "github:misterio77/nix-colors"; nixvim.url = "github:nix-community/nixvim"; catppuccin.url = "github:catppuccin/nix";