From 9cf54953958b6210b27acc9e2ea8103b7a7f5c3d Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Fri, 19 Jul 2024 19:48:46 +0100 Subject: [PATCH] update config --- flake.lock | 58 ++++++++++++++++----------------- hosts/default/configuration.nix | 14 ++++---- hosts/default/home.nix | 20 +----------- modules/desktop/hyprland.nix | 4 --- 4 files changed, 38 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index fbada12..fcef8c0 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "zls": "zls" }, "locked": { - "lastModified": 1721186988, - "narHash": "sha256-hr6NObLWYaFuyDujUgUExnmY2aF7IES1z5AQzl6V5gA=", + "lastModified": 1721363963, + "narHash": "sha256-l9JqbMW3KO24lH0OsNIQrzNHZ/AJcCro/ihq+ZK15oU=", "ref": "refs/heads/main", - "rev": "11571a86daa468eab06ee373db5d555941226149", - "revCount": 6603, + "rev": "1eb18895bf881b229219d2b411c14707a795d1fc", + "revCount": 6627, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -172,11 +172,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1721162167, - "narHash": "sha256-seS+vRTrXWMBPUHUM0MYLd5Sg1JBICSzZX5daA/Vw+c=", + "lastModified": 1721332982, + "narHash": "sha256-UiNq9EDnnWXaG7d5AExvPlzapuw4VyWnFHTo38Q3kn4=", "owner": "hyprwm", "repo": "hypridle", - "rev": "fc4e3bd2dccd3b2e816c7cbe2dca25fa5e83a4bd", + "rev": "e5366d34b5e1f06a1233667cded3ef05b482778c", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721160190, - "narHash": "sha256-dnC7b/C8QRPoGs2H2cAYWmrTRVhN5m1xDpyrNTqV8r8=", + "lastModified": 1721332628, + "narHash": "sha256-kEB88spCIG7xTvKPlkghDNqZz26YHa0B06Ku2zsGFgo=", "ref": "refs/heads/main", - "rev": "293e687389a19b369f312c5c335c9afe7c886be1", - "revCount": 4929, + "rev": "8e15f91c2417c8f05d69a93f1294185ccc5f8f3e", + "revCount": 4931, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -365,11 +365,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1721222562, - "narHash": "sha256-pkWRiX+9fDuS94yMR11txMufLaTgt3p38yG+LOeoOTc=", + "lastModified": 1721402798, + "narHash": "sha256-41nFfp21bY5cr6Pb5x8OgtTXRlZJgKlKWWfxbjT0fwc=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "9514925a7c4c11028b6e3aae548b9c6859849462", + "rev": "20c01d91d4d04767ab6ea997a23cfa65fe043cf6", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1721071737, - "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1721071737, - "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -540,11 +540,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index e2a1879..cdadf9e 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -40,7 +40,7 @@ }; # Set your time zone. - time.timeZone = "Europe/Dublin"; + time.timeZone = "America/New_York"; # Select internationalisation properties. i18n= { @@ -91,14 +91,16 @@ blueman.enable = true; printing.enable = true; # Enable CUPS to print documents. gvfs.enable = true; - # auto-cpufreq.enable = true; + auto-cpufreq.enable = true; thermald.enable = true; }; - powerManagement = { - enable = true; - powertop.enable = true; - }; + # powerManagement = { + # enable = true; + # powertop.enable = true; + # }; + services.power-profiles-daemon.enable = false; + environment.etc."greetd/environments".text = '' Hyprland none+i3 diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 7e64336..f9c4fb7 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -20,12 +20,6 @@ # environment. nixpkgs.config.allowUnfree = true; - # nixpkgs.overlays = [ - # (import (builtins.fetchTarball { - # url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; - # sha256 = "00f028qrz2z0i7ma24993pwxcrx2viay6jygaz3jykj7lrww6ja6"; - # })) - # ]; home.packages = with pkgs; [ android-studio audacity @@ -34,7 +28,7 @@ contour dmenu emacs-all-the-icons-fonts - # emacsPackages.pdf-tools + emacsPackages.pdf-tools exfatprogs fastfetch filezilla @@ -47,7 +41,6 @@ nautilus grim grimblast - # gvfs htop keepassxc libsForQt5.polkit-kde-agent @@ -60,7 +53,6 @@ pamixer pavucontrol picom - powertop praat prismlauncher qbittorrent @@ -74,7 +66,6 @@ wev wl-clipboard xdg-user-dirs - # etcher ## Currently Uses Electron-19 -- which is marked EOL ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -148,10 +139,6 @@ recursive = true; source = ../../modules/old_configs/ghostty; }; - # "hypr" = { - # recursive = true; - # source = ../../modules/old_configs/hypr; - # }; "kitty" = { recursive = true; source = ../../modules/old_configs/kitty; @@ -164,10 +151,6 @@ recursive = true; source = ../../modules/old_configs/river; }; - # "swaylock" = { - # recursive = true; - # source = ../../modules/old_configs/swaylock; - # }; "waybar" = { recursive = true; source = ../../modules/old_configs/waybar; @@ -275,6 +258,5 @@ enableSshSupport = true; }; nextcloud-client.enable = true; - # swayidle.enable = true; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 3fa57bd..0950ba0 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -128,10 +128,6 @@ preserve_split = true; }; - master = { - new_is_master = true; - }; - gestures = { workspace_swipe = true; };