redshift: include package on path

snowhawk: stop using nix-ld
snowhawk: remove zenbrowser
2024-09-24 08:01:30 -07:00 · 2024-09-22 21:55:38 -07:00 · 2024-09-22 21:55:27 -07:00 · 2024-09-22 21:52:25 -07:00 · 2024-09-20 11:58:48 -07:00 · 2024-09-19 03:27:20 -07:00
6 changed files with 115 additions and 100 deletions
--- a/flake.lock
+++ b/flake.lock
@ -92,11 +92,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
        "type": "github"
      },
      "original": {
@ -131,11 +131,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
        "type": "github"
      },
      "original": {
@ -191,11 +191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724857454,
-        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "lastModified": 1726745158,
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
        "type": "github"
      },
      "original": {
@ -255,11 +255,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1726985855,
+        "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
        "type": "github"
      },
      "original": {
@ -296,7 +296,7 @@
        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
      },
      "original": {
        "type": "tarball",
@ -315,11 +315,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725515460,
-        "narHash": "sha256-ybr3YTmjhVOuCWdacABUPxfUlVNqy0ya3s2sZ8zgyTw=",
+        "lastModified": 1726965320,
+        "narHash": "sha256-N1ZPfRm+9CW6MNWjbghvmbfEAclLHABzSnRXh7z3WAQ=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "e8df4bbcb3a2d18a32d8a50bd72c3175227f7468",
+        "rev": "e37970c7801fe598290167855d77f3780d821010",
        "type": "github"
      },
      "original": {
@ -331,11 +331,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1725446059,
-        "narHash": "sha256-N+XyobzJsFXVivL/uu8lHSc9vxlM3j5SSOc4G9B0SyA=",
+        "lastModified": 1726956168,
+        "narHash": "sha256-unElU0uavf4fTNtKOp0N1iIwOexg1PksKue3OeIv7TU=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "b6e350a6b4df40fcc99931c460668c36fadc9989",
+        "rev": "e697c1b43dfbeab132fee4149157f7abd08c51a0",
        "type": "github"
      },
      "original": {
@ -357,11 +357,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1726061420,
-        "narHash": "sha256-nEjj3UZKg4W8K5XUwqR+WeuiND5Qw4xK1tD5h4GzJ8A=",
+        "lastModified": 1726910621,
+        "narHash": "sha256-g9c/jW5CUV7k9qVlhw0qez3VNtHkUm/3HPe001+UPMI=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "74c0df9dca8d218120f57f83c51224bf36a472df",
+        "rev": "e2c07baf7baadb727de0bced965f154d2a8c84a9",
        "type": "github"
      },
      "original": {
@ -373,16 +373,16 @@
    "niri-stable": {
      "flake": false,
      "locked": {
-        "lastModified": 1723290956,
-        "narHash": "sha256-13xynDWoOqogUKZTf6lz267hEQGdCE+BE6acs2G3j8k=",
+        "lastModified": 1726304152,
+        "narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "9063a5dbdc0d4470dc1e13ce5749838e32af6a44",
+        "rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
        "type": "github"
      },
      "original": {
        "owner": "YaLTeR",
-        "ref": "v0.1.8",
+        "ref": "v0.1.9",
        "repo": "niri",
        "type": "github"
      }
@ -390,11 +390,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1725957188,
-        "narHash": "sha256-XjDbhHG2qxTmuX8rcIob4T7AM33NjgTA5QBcexjI0aU=",
+        "lastModified": 1726412705,
+        "narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "087a50a19c87175bc6c2a3b7ddc886f98f26f7c4",
+        "rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6",
        "type": "github"
      },
      "original": {
@ -405,11 +405,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725432240,
-        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
+        "lastModified": 1726755586,
+        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
+        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
        "type": "github"
      },
      "original": {
@ -433,11 +433,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1725930920,
-        "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
+        "lastModified": 1726838390,
+        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
+        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
        "type": "github"
      },
      "original": {
@ -449,11 +449,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1721524707,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "lastModified": 1725762081,
+        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
        "type": "github"
      },
      "original": {
@ -500,11 +500,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1725540166,
-        "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
+        "lastModified": 1726524647,
+        "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
        "owner": "mic92",
        "repo": "sops-nix",
-        "rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
+        "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
        "type": "github"
      },
      "original": {
@ -548,11 +548,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1723095288,
-        "narHash": "sha256-cUlTHg/F0tUpjS/uAIYKwrIRaKwuzdyFo3IiST6E7Fc=",
+        "lastModified": 1726378112,
+        "narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "95afa163a60167cd97bf6afa870bc117a1be3d03",
+        "rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4",
        "type": "github"
      },
      "original": {
--- a/home/modules/redshift.nix
+++ b/home/modules/redshift.nix
@ -39,5 +39,9 @@ in
      "locations/snowhawk/lat".path = "${cfgDir}/lat";
      "locations/snowhawk/lon".path = "${cfgDir}/lon";
    };
+
+    home.packages = with pkgs; [
+      redshift
+    ];
  };
 }
--- a/hosts/snowhawk/configuration.nix
+++ b/hosts/snowhawk/configuration.nix
@ -18,7 +18,6 @@
  time.timeZone = "America/Los_Angeles";

  snowhawk = {
-    nix-ld.enable = true;
    wake-on-lan.enable = true;
    dwm.enable = true;
    syncthing.enable = true;
--- a/hosts/snowhawk/hardware-configuration.nix
+++ b/hosts/snowhawk/hardware-configuration.nix
@ -1,5 +1,40 @@
 { config, lib, pkgs, modulesPath, ... }:

+let
+  default-monitors = pkgs.writeXrandrScriptBin "default-monitors" {
+    DP-0 = {
+      primary = true;
+      mode = "1920x1080";
+      pos = "1920x0";
+      rotate = "normal";
+    };
+    HDMI-0 = {
+      mode = "1920x1080";
+      pos = "0x0";
+      rotate = "normal";
+    };
+  };
+
+  tv-on = pkgs.writeXrandrScriptBin "tv-on" {
+    DP-0 = {
+      primary = true;
+      mode = "1920x1080";
+      pos = "1920x1080";
+      rotate = "normal";
+    };
+    HDMI-0 = {
+      mode = "1920x1080";
+      pos = "0x1080";
+      rotate = "normal";
+    };
+    HDMI-1 = {
+      mode = "1920x1080";
+      pos = "1920x0";
+      rotate = "normal";
+    };
+  };
+
+in
 {
  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

@ -37,33 +72,14 @@
  # Load nvidia driver for Xorg and Wayland
  services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
  services.xserver.dpi = lib.mkDefault 96;
-  # services.xserver.xrandrHeads = [
-  #   { output = "HDMI-0"; }
-  #   {
-  #     output = "DP-0";
-  #     primary = true;
-  #     monitorConfig = ''
-  #       Option "Position" "1920 0"
-  #     '';
-  #   }
-  # ];

+  environment.systemPackages = [
+    default-monitors
+    tv-on
+  ];

  systemd.user.services.screenlayout = {
-    script = lib.getExe
-      (pkgs.writeXrandrScriptBin "default-monitors" {
-        DP-0 = {
-          primary = true;
-          mode = "1920x1080";
-          pos = "1920x0";
-          rotate = "normal";
-        };
-        HDMI-0 = {
-          mode = "1920x1080";
-          pos = "0x0";
-          rotate = "normal";
-        };
-      });
+    script = lib.getExe default-monitors;
    wantedBy = [ "graphical-session.target" ];
    partOf = [ "graphical-session.target" ];
  };
--- a/hosts/snowhawk/home.nix
+++ b/hosts/snowhawk/home.nix
@ -37,13 +37,10 @@
    homeNetwork = true;
  };

+  # WM Stuff
  xsession.numlock.enable = true;
-
  services.unclutter.enable = true;

-
-  # services.easyeffects.enable = true;
-
  home.packages = with pkgs; [
    ripgrep
    unzip
@ -73,25 +70,6 @@
      systemctl suspend
    '')

-    (writeXrandrScriptBin "tv-on" {
-      DP-0 = {
-        primary = true;
-        mode = "1920x1080";
-        pos = "1920x1080";
-        rotate = "normal";
-      };
-      HDMI-0 = {
-        mode = "1920x1080";
-        pos = "0x1080";
-        rotate = "normal";
-      };
-      HDMI-1 = {
-        mode = "1920x1080";
-        pos = "1920x0";
-        rotate = "normal";
-      };
-    })
-
    feh
    imagemagick
    uhk-agent
@ -113,16 +91,9 @@
    nomacs
    gqview

-    zenBrowser
+    # zenBrowser
  ];

-  # wayland.windowManager.hyprland = {
-  #   enable = true;
-  #   package = pkgs.hyprland;
-  #   xwayland.enable = true;
-  #   systemd.enable = true;
-  # };
-
  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
  home.stateVersion = "23.11";
--- a/modules/glib-schemas-fix.nix
+++ b/modules/glib-schemas-fix.nix
@ -0,0 +1,25 @@
+# Yoink https://github.com/thomX75/nixos-modules/blob/56fd73011f022e7c85bd7a40812663c5933106f9/Glib-Schemas-Fix/glib-schemas-fix.nix
+
+# Glib Schemas Fix
+# https://github.com/thomX75/nixos-modules
+
+{ config, pkgs, lib, ... }:
+
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.snowhawk.glib-schemas-fix;
+in
+{
+  options.snowhawk.glib-schemas-fix = {
+    enable = mkEnableOption "glib-schemas-fix nixos module";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ gtk3 ];
+
+    environment.variables = {
+      GSETTINGS_SCHEMA_DIR = "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/glib-2.0/schemas";
+    };
+  };
+}
Author	SHA1	Message	Date
Zynh Ludwig	1b8a3eab9e	redshift: include package on path	2024-09-24 08:01:30 -07:00
Zynh Ludwig	ea634d7498	snowhawk: stop using nix-ld	2024-09-22 21:55:38 -07:00
Zynh Ludwig	0cc7b72237	snowhawk: remove zenbrowser	2024-09-22 21:55:27 -07:00
Zynh Ludwig	0907bce6f4	flake: update	2024-09-22 21:52:25 -07:00
Zynh Ludwig	df2abeac3e	glib-schemas-fix: module init	2024-09-20 11:58:48 -07:00
Zynh Ludwig	a87f8feb1a	snowhawk: move monitor config to hardware	2024-09-19 03:27:20 -07:00
Zynh Ludwig	217f09f7ef	snowhawk: remove xrandrHeads comment	2024-09-19 03:24:37 -07:00
Zynh Ludwig	789c09e24a	snowhawk: home cleanup	2024-09-19 03:20:33 -07:00