(wip) home: switch to tmux

:(
qtwebengine: 5.15.17 → 6.7.2, +156144.3 KiB

flake.lock

@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720211568,
+        "lastModified": 1719675517,
-        "narHash": "sha256-Uph6rcbiuOD6bGEySonDFozdO+mznTug08x27WG4BIg=",
+        "narHash": "sha256-QXMYL1ay66M7T/JdaO4wR8K58GkV5CNN8U15gwifdbY=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "ce7e02b20fe45425bbdbebc6fe0fdcc018c9efc6",
+        "rev": "4688aa9f107d6d7ac46a98a01f7105cac8e7dbe6",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720226507,
+        "lastModified": 1719880336,
-        "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=",
+        "narHash": "sha256-VnUCaGI7FEh7tLVsD6OsychPmqjDYXqJEdFG4jK86zs=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "0aed560c5c0a61c9385bddff471a13036203e11c",
+        "rev": "047c929ad65d8378f18de95ca66769ca04161caf",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720056646,
+        "lastModified": 1719864345,
-        "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=",
+        "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e",
+        "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
+        "lastModified": 1719877454,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720327769,
+        "lastModified": 1719827439,
-        "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -229,15 +229,15 @@
       "locked": {
         "lastModified": 1718491861,
         "narHash": "sha256-nnKZRkwXoCtGN8Rgv6FcHttX1JOPWQt2y7yY4Bz/hWk=",
-        "ref": "refs/heads/master",
+        "owner": "Guanran928",
+        "repo": "nvim",
         "rev": "49f55400d06fa113e4b4ae5a6fa97a6d83c59983",
-        "revCount": 64,
+        "type": "github"
-        "type": "git",
-        "url": "https://git.ny4.dev/nyancat/nvim"
       },
       "original": {
-        "type": "git",
+        "owner": "Guanran928",
-        "url": "https://git.ny4.dev/nyancat/nvim"
+        "repo": "nvim",
+        "type": "github"
       }
     },
     "nix-darwin": {
@@ -247,11 +247,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720337362,
+        "lastModified": 1719845423,
-        "narHash": "sha256-9TNQtlwu97NPaJYsKkdObOsy0MLN4NAOBz0pqwH3KnA=",
+        "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "0f89b73f41eaa1dde67b291452c181d9a75f10dd",
+        "rev": "ec12b88104d6c117871fad55e931addac4626756",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720301939,
+        "lastModified": 1719869943,
-        "narHash": "sha256-yP2+IPhcUscJbwbuAaHQRAIKrrnF1ePQBwwzGFlfqmE=",
+        "narHash": "sha256-MDd7osBHV/kk2jGyd7v29CKQVVexus4bGSbzUBer63U=",
         "owner": "jacekszymanski",
         "repo": "nixcasks",
-        "rev": "b3ebbbc306d051edb9bc2fa9dc791dabfd3d106b",
+        "rev": "e41da9d30fc57349150dc9fb39e029f761ce0d9e",
         "type": "github"
       },
       "original": {
@@ -374,11 +374,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720181791,
+        "lastModified": 1719826879,
-        "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=",
+        "narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb",
+        "rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8",
         "type": "github"
       },
       "original": {
@@ -390,11 +390,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719957072,
+        "lastModified": 1719663039,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
+        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
+        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720352738,
+        "lastModified": 1719894733,
-        "narHash": "sha256-S/FwaFfzUaGv81QxJJFWbrWhAAlR+L3S5i2MIujqmcE=",
+        "narHash": "sha256-T/zofRVToXkbvjBX+wnEOLCpaX3BbvMh9ZN6cKFydaA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "18a4856920ac463d8ed386d9830a7742e2cf2c2c",
+        "rev": "b978045baa040e6953fbe0a18c111749931673af",
         "type": "github"
       },
       "original": {
@@ -527,11 +527,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720318855,
+        "lastModified": 1719886738,
-        "narHash": "sha256-w3CCVK9LJ5aznXGkO1IyAlbvMNJfyA+dBF7Z1Zwx1LA=",
+        "narHash": "sha256-6eaaoJUkr4g9J/rMC4jhj3Gv8Sa62rvlpjFe3xZaSjM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3eed08a074cd2000884a69d448d70da2843f7103",
+        "rev": "db12d0c6ef002f16998723b5dd619fa7b8997086",
         "type": "github"
       },
       "original": {
@@ -566,11 +566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720321395,
+        "lastModified": 1719873517,
-        "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=",
+        "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea",
+        "rev": "a11224af8d824935f363928074b4717ca2e280db",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720190661,
+        "lastModified": 1719835186,
-        "narHash": "sha256-51aPk6VqCSEuQeGvi/j5pdRyx8UxvqBeph+sXsj94EU=",
+        "narHash": "sha256-o0FB8SQVLOnbsYTk2Bt6gXwsfqEv4ZHsGP50/kM/gR0=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "27dbc690931cc30f2c4bb2ff39e46490c3b6421d",
+        "rev": "14b3b0aa48fa291f1be26ab8948d5b9eadaed0b8",
         "type": "github"
       },
       "original": {

flake.nix

@@ -41,7 +41,7 @@
       inputs.rust-overlay.follows = "rust-overlay";
     };
     neovim = {
-      url = "git+https://git.ny4.dev/nyancat/nvim";
+      url = "github:Guanran928/nvim";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
       inputs.treefmt-nix.follows = "treefmt-nix";

home/applications/foot/default.nix

@@ -3,7 +3,6 @@
     enable = true;
     settings = {
       main.font = "monospace:size=10";
-      main.resize-by-cells = false;
       cursor.style = "beam";
     };
   };

home/applications/nautilus/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = [pkgs.nautilus];
+  home.packages = [pkgs.gnome.nautilus];
   dconf.settings = {
     "org/gnome/nautilus/list-view".default-zoom-level = "small";
     "org/gnome/nautilus/preferences".default-folder-viewer = "list-view";

home/applications/sway/default.nix

@@ -4,18 +4,7 @@
   lib,
   inputs,
   ...
-}: let
+}: {
-  # https://www.pixiv.net/en/artworks/49983419
-  image = pkgs.fetchurl {
-    url = "https://i.pximg.net/img-original/img/2015/04/23/12/43/35/49983419_p0.jpg";
-    hash = "sha256-JZ5VmsjVjZfHXpx3JxzAyYzZppZmgH38AiAA+B0TDiw=";
-    curlOptsList = ["-e" "https://www.pixiv.net/"];
-  };
-  # Crop 100px on top and bottom
-  background = pkgs.runCommandLocal "49983419_p0.jpg" {} ''
-    ${lib.getExe pkgs.imagemagick} convert ${image} -crop 3500x1600+0+100 $out
-  '';
-in {
   imports = [
     ../i3status-rust
     ../mako
@@ -60,7 +49,8 @@ in {
       ];
 
       ### Visuals
-      output."*".bg = "${background} fill";
+      # https://danbooru.donmai.us/posts/6018861
+      output."*".bg = "${./background.png} fill";
       bars = [
         {
           statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml";

home/applications/tmux/default.nix

@@ -1,21 +1,18 @@
 {
+  # nickcao's config
   programs.tmux = {
     enable = true;
-
-    # value from tmux-sensible, but got overridden by HM (?)
-    aggressiveResize = true;
-    escapeTime = 0;
-    historyLimit = 50000;
-
     baseIndex = 1;
-    customPaneNavigationAndResize = true;
+    escapeTime = 10;
     keyMode = "vi";
-    mouse = true;
+    terminal = "screen-256color";
-    newSession = true;
-    terminal = "tmux-256color";
     extraConfig = ''
+      # set -g status-position top
       set -g set-clipboard on
-      set -g renumber-windows on
+      set -g mouse on
+      # set -g status-right ""
+      # set -g renumber-windows on
+      # new-session -s main
     '';
   };
 }

hosts/aristotle/default.nix

@@ -35,14 +35,14 @@
       "ydict"
     ];
 
-    home.packages =
+    home.packages = with pkgs;
-      (with pkgs; [
+      [
         amberol
         fractal
-        gnome-calculator
+        gnome.gnome-calculator
         hyperfine
         mousai
-      ])
+      ]
       ++ (with inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.scripts; [
         lofi
       ]);
@@ -55,18 +55,4 @@
 
   # fucking hell
   programs.anime-game-launcher.enable = true;
-
-  # nouveou
-  services.xserver.videoDrivers = [];
-
-  # novideo
-  # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
-  # environment.sessionVariables."MOZ_ENABLE_WAYLAND" = "0";
-  # networking.networkmanager.enable = false;
-  # services.xserver.desktopManager.gnome.enable = true;
-  # services.xserver.displayManager.gdm.enable = true;
-  # # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1562
-  # services.udev.extraRules = ''
-  #   ENV{DEVNAME}=="/dev/dri/card1", TAG+="mutter-device-preferred-primary"
-  # '';
 }

nixos/profiles/common/core/nix/nix.nix

@@ -22,12 +22,7 @@
     ];
 
     trusted-users = ["@wheel"];
-    experimental-features = [
+    experimental-features = ["auto-allocate-uids" "cgroups"];
-      "auto-allocate-uids"
-      "cgroups"
-      "no-url-literals"
-    ];
-    allow-import-from-derivation = false;
     auto-allocate-uids = true;
     builders-use-substitutes = true;
     use-cgroups = true;

nixos/profiles/common/graphical/home/default.nix

@@ -23,13 +23,16 @@
     end
   '';
 
-  home.packages = with pkgs; [
+  home.packages =
+    (with pkgs; [
       loupe
-    gnome-calculator
+    ])
+    ++ (with pkgs.gnome; [
       seahorse
       file-roller
+      gnome-calculator
       dconf-editor
-  ];
+    ]);
 
   services = {
     ssh-agent.enable = true;

nixos/profiles/common/graphical/home/theme.nix

@@ -6,7 +6,7 @@
 }: {
   home.pointerCursor = {
     name = "Adwaita";
-    package = pkgs.adwaita-icon-theme;
+    package = pkgs.gnome.adwaita-icon-theme;
     size = 24;
     gtk.enable = true;
   };
@@ -21,7 +21,7 @@
 
     iconTheme = {
       name = "Adwaita";
-      package = pkgs.adwaita-icon-theme;
+      package = pkgs.gnome.adwaita-icon-theme;
     };
 
     theme = {

overlays/default.nix

@@ -5,8 +5,11 @@ let
     });
 in {
   patches = _final: prev: {
+    gnome =
+      prev.gnome
+      // {
         # https://aur.archlinux.org/pkgbase/nautilus-typeahead
-    nautilus = prev.nautilus.overrideAttrs {
+        nautilus = prev.gnome.nautilus.overrideAttrs {
           src = prev.fetchFromGitLab {
             domain = "gitlab.gnome.org";
             owner = "albertvaka";
@@ -20,6 +23,7 @@ in {
             awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml
           '';
         };
+      };
 
     sway-unwrapped = addPatches prev.sway-unwrapped [
       # text_input: Implement input-method popups