misc update
home: some keybind changes nvim: random lsp related changes hosts/satori: add a separate nix.nix file home/services: random mpd update
This commit is contained in:
		
							
								
								
									
										183
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										183
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -5,11 +5,11 @@
 | 
			
		||||
        "nixpkgs": "nixpkgs"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1641576265,
 | 
			
		||||
        "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=",
 | 
			
		||||
        "lastModified": 1646105662,
 | 
			
		||||
        "narHash": "sha256-jdXCZbGZL0SWWi29GnAOFHUh/QvvP0IyaVLv1ZTDkBI=",
 | 
			
		||||
        "owner": "ryantm",
 | 
			
		||||
        "repo": "agenix",
 | 
			
		||||
        "rev": "08b9c96878b2f9974fc8bde048273265ad632357",
 | 
			
		||||
        "rev": "297cd58b418249240b9f1f155d52b1b17f292884",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -36,11 +36,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "emacs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642907001,
 | 
			
		||||
        "narHash": "sha256-Basy/QPtDPt5AiEz0QZnAn0aZgPyFCHPJZPAy1TRD/I=",
 | 
			
		||||
        "lastModified": 1646414475,
 | 
			
		||||
        "narHash": "sha256-Linz0Q0FaNYkHniXnlUdCYUI9qeHvcS/dbn13Q3w4Bg=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "emacs-overlay",
 | 
			
		||||
        "rev": "bed8ed5a6d51db297253c45b2c866fc33854db9f",
 | 
			
		||||
        "rev": "2fc6f185dbbc0dbf35289648aab0a8dfd1bba320",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -115,11 +115,11 @@
 | 
			
		||||
        "nixpkgs": "nixpkgs_2"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642882610,
 | 
			
		||||
        "narHash": "sha256-pmdgeJ9v6y+T0UfNQ/Z+Hdv5tPshFFra5JLF/byUA/Y=",
 | 
			
		||||
        "lastModified": 1646364779,
 | 
			
		||||
        "narHash": "sha256-481vkO9b3h++bHzLbGDDhgpBoXQ0Wlo4lm4h5/EJMO4=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "c47c350f6518ed39c2a16e4fadf9137b6c559ddc",
 | 
			
		||||
        "rev": "d119cea3763977801ad66330668c1ab4346cb7f7",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -133,11 +133,11 @@
 | 
			
		||||
        "nixpkgs": "nixpkgs_3"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642653493,
 | 
			
		||||
        "narHash": "sha256-22mGPjiHUo2Jmze4IjXCJLjeK2mbvvCztHmUyUMr4yw=",
 | 
			
		||||
        "lastModified": 1643933536,
 | 
			
		||||
        "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "28b9ae40c45c5e7711c353fee1b7af734e293979",
 | 
			
		||||
        "rev": "2860d7e3bb350f18f7477858f3513f9798896831",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -151,16 +151,14 @@
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "blobs": "blobs",
 | 
			
		||||
        "nixpkgs": "nixpkgs_4",
 | 
			
		||||
        "nixpkgs-21_05": "nixpkgs-21_05",
 | 
			
		||||
        "nixpkgs-21_11": "nixpkgs-21_11",
 | 
			
		||||
        "utils": "utils"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1638911354,
 | 
			
		||||
        "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
 | 
			
		||||
        "lastModified": 1645895212,
 | 
			
		||||
        "narHash": "sha256-SbR7HtHg7/UopLYLmMwwFZGF0BTmg0tLwIU/rQtRLfk=",
 | 
			
		||||
        "owner": "simple-nixos-mailserver",
 | 
			
		||||
        "repo": "nixos-mailserver",
 | 
			
		||||
        "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
 | 
			
		||||
        "rev": "7de138037f62679e2fefa0549af543412dab0d1a",
 | 
			
		||||
        "type": "gitlab"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -171,11 +169,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "master": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642909347,
 | 
			
		||||
        "narHash": "sha256-S6yg5kwTsyhEmq44cKGtA8jy9Z21Hq6m2IIz6XoqJNE=",
 | 
			
		||||
        "lastModified": 1646432949,
 | 
			
		||||
        "narHash": "sha256-KOo9y7Nfx2uK5+73WRYEAd7DqUJyPDhiE8RMBHiwTwg=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "22eff4f912947a7db3c07e5b319e211c33e39957",
 | 
			
		||||
        "rev": "3effa9c7dbe14c8d8d359dbbcf9ff3dc8603fc53",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -208,15 +206,18 @@
 | 
			
		||||
    "neovim-flake": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-utils": "flake-utils_2",
 | 
			
		||||
        "nixpkgs": "nixpkgs_8"
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nvim",
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "dir": "contrib",
 | 
			
		||||
        "lastModified": 1642784680,
 | 
			
		||||
        "narHash": "sha256-nU4vyFC0BYzv47McYsNJYDu/8ttPgPHTmowueukxpoA=",
 | 
			
		||||
        "lastModified": 1646337600,
 | 
			
		||||
        "narHash": "sha256-BjVKXtt6zcnPzoVnHHNoQFJHjAPoRvN5nD8oz+zZNsw=",
 | 
			
		||||
        "owner": "neovim",
 | 
			
		||||
        "repo": "neovim",
 | 
			
		||||
        "rev": "e07a4b97f6552674f6038d15c0767bbfea082bf2",
 | 
			
		||||
        "rev": "e23af71d35a3d31d476168d3a0a822048aa2c54f",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -232,11 +233,11 @@
 | 
			
		||||
        "utils": "utils_3"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642719993,
 | 
			
		||||
        "narHash": "sha256-osCgh6MHvhwS30591CEwQ15KKtRWb73xY3Y0x3ZqpxE=",
 | 
			
		||||
        "lastModified": 1646010816,
 | 
			
		||||
        "narHash": "sha256-V37UBT+qobt7MlrO9TLPV9EKH/tTz8AMjtcjqSokbcg=",
 | 
			
		||||
        "owner": "fufexan",
 | 
			
		||||
        "repo": "nix-gaming",
 | 
			
		||||
        "rev": "e935a8490bd218fe48ed89737c91d33fdf82ec29",
 | 
			
		||||
        "rev": "e604df32b512d04635d4082dc6c5652b9cc88a3f",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -258,59 +259,13 @@
 | 
			
		||||
        "type": "indirect"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs-21_05": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1625692408,
 | 
			
		||||
        "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "id": "nixpkgs",
 | 
			
		||||
        "ref": "nixos-21.05",
 | 
			
		||||
        "type": "indirect"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs-21_11": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1638371214,
 | 
			
		||||
        "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "id": "nixpkgs",
 | 
			
		||||
        "ref": "nixos-21.11",
 | 
			
		||||
        "type": "indirect"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_10": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1637453606,
 | 
			
		||||
        "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "ref": "nixpkgs-unstable",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_2": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642819963,
 | 
			
		||||
        "narHash": "sha256-pfd+ZKHj88jHtnRbLP/+uj3qNUjrkrQGRp9w3YKDzeQ=",
 | 
			
		||||
        "lastModified": 1646331602,
 | 
			
		||||
        "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "6631973f4502938ccfc75fe8b9d0a3259080d82d",
 | 
			
		||||
        "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -320,11 +275,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_3": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642819963,
 | 
			
		||||
        "narHash": "sha256-pfd+ZKHj88jHtnRbLP/+uj3qNUjrkrQGRp9w3YKDzeQ=",
 | 
			
		||||
        "lastModified": 1646331602,
 | 
			
		||||
        "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "6631973f4502938ccfc75fe8b9d0a3259080d82d",
 | 
			
		||||
        "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -334,11 +289,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_4": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1626852498,
 | 
			
		||||
        "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
 | 
			
		||||
        "lastModified": 1642635915,
 | 
			
		||||
        "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
 | 
			
		||||
        "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -365,11 +320,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_6": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642265851,
 | 
			
		||||
        "narHash": "sha256-6J2paKHuQKhaBJNVf7k1NI9pqiMiAlkgt0x7obFtQ70=",
 | 
			
		||||
        "lastModified": 1645162597,
 | 
			
		||||
        "narHash": "sha256-S4sRtJBqVlBg4H7EPAv0NFofGNCayHEMpLnUzGNCCKM=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "60dec7aa319dc620cd77ecae8ce48f5374450452",
 | 
			
		||||
        "rev": "b715fcd9d9e26b99182d902c6b5694be0daae6d5",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -380,11 +335,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_7": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642819963,
 | 
			
		||||
        "narHash": "sha256-pfd+ZKHj88jHtnRbLP/+uj3qNUjrkrQGRp9w3YKDzeQ=",
 | 
			
		||||
        "lastModified": 1646331602,
 | 
			
		||||
        "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "6631973f4502938ccfc75fe8b9d0a3259080d82d",
 | 
			
		||||
        "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -396,11 +351,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_8": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642814535,
 | 
			
		||||
        "narHash": "sha256-FKX6vDo4MeE/QpWvCrPFQBkwzj2zYxUR5QR/9RTSFEo=",
 | 
			
		||||
        "lastModified": 1646254136,
 | 
			
		||||
        "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "fc4148a47fa927319186061aa42633c8aa5777f1",
 | 
			
		||||
        "rev": "3e072546ea98db00c2364b81491b893673267827",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -412,27 +367,27 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_9": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642635915,
 | 
			
		||||
        "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "lastModified": 1637453606,
 | 
			
		||||
        "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
 | 
			
		||||
        "rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "ref": "nixos-unstable",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "ref": "nixpkgs-unstable",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nur": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642906509,
 | 
			
		||||
        "narHash": "sha256-W4H8jx1yTFyVWzSwsmfZs3Zx4LElhK/JL+vlBmSTt48=",
 | 
			
		||||
        "lastModified": 1646418326,
 | 
			
		||||
        "narHash": "sha256-4oj38RKfFdZhzd+0GUEU3RgmOuO334gAarkDCNFn9E0=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "NUR",
 | 
			
		||||
        "rev": "5583de315930c2b73c8491607fb80ab0689a014f",
 | 
			
		||||
        "rev": "a08648cb31807b28ec116b3e04f848cf9546be80",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -445,14 +400,14 @@
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-compat": "flake-compat",
 | 
			
		||||
        "neovim-flake": "neovim-flake",
 | 
			
		||||
        "nixpkgs": "nixpkgs_9"
 | 
			
		||||
        "nixpkgs": "nixpkgs_8"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642839161,
 | 
			
		||||
        "narHash": "sha256-d2DVBjVh9cA6MWAXs+ayUncmY2VnXSLwIS2o9EnIZeQ=",
 | 
			
		||||
        "lastModified": 1646381662,
 | 
			
		||||
        "narHash": "sha256-cyzicCplzqS0g3gLefwicHRn0FQw95o+98fHQfLpQjw=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "neovim-nightly-overlay",
 | 
			
		||||
        "rev": "ca9465259e268b343b9875b17fd3a97a1c72c242",
 | 
			
		||||
        "rev": "9eb52a08308ed8e3641125e112c191eb53efefee",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -499,14 +454,14 @@
 | 
			
		||||
    "rust": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-utils": "flake-utils_3",
 | 
			
		||||
        "nixpkgs": "nixpkgs_10"
 | 
			
		||||
        "nixpkgs": "nixpkgs_9"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642838864,
 | 
			
		||||
        "narHash": "sha256-pHnhm3HWwtvtOK7NdNHwERih3PgNlacrfeDwachIG8E=",
 | 
			
		||||
        "lastModified": 1646360880,
 | 
			
		||||
        "narHash": "sha256-Xu/gQO2eqRBOOarjl7XuPdrtKagAGAZDn6AlIRzGUns=",
 | 
			
		||||
        "owner": "oxalica",
 | 
			
		||||
        "repo": "rust-overlay",
 | 
			
		||||
        "rev": "9fb49daf1bbe1d91e6c837706c481f9ebb3d8097",
 | 
			
		||||
        "rev": "194016e6b086bfa5965aeb8979c58b93e03e2485",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -517,11 +472,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "stable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642798845,
 | 
			
		||||
        "narHash": "sha256-1g1X3wKmroGix68OXwb4gR1yXKPQ36apI1dssd/YbuM=",
 | 
			
		||||
        "lastModified": 1646258393,
 | 
			
		||||
        "narHash": "sha256-mKDoCi5Baqainjf0Nx6oTPhaxKQdj4P17XTdhTtXGRA=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "e84444b14cc75a4be17b58fd2c344f47dddf084e",
 | 
			
		||||
        "rev": "ed02c2ba0384b2800db41333045a6fb781f12aac",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -581,11 +536,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "utils_4": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1642700792,
 | 
			
		||||
        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
 | 
			
		||||
        "lastModified": 1644229661,
 | 
			
		||||
        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
 | 
			
		||||
        "owner": "numtide",
 | 
			
		||||
        "repo": "flake-utils",
 | 
			
		||||
        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
 | 
			
		||||
        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
 
 | 
			
		||||
@@ -33,7 +33,7 @@ config =
 | 
			
		||||
          Run $ Memory ["-t", "<fn=1>\xf538</fn> <usedratio>%", "-H", "10240", "-L", "6144", "-h", magenta, "-l", green, "-n", yellow] 20,
 | 
			
		||||
          Run $ BatteryP ["BAT1", "BAT0", "BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", magenta, "-h", green, "-n", yellow, "--", "-O", "Charging", "-o", "<left>%", "-a", "notify-send -u critical 'Battery running out!'", "-A", "5", "--lows", "<fn=1>\xf243</fn> ", "--mediums", "<fn=1>\xf242</fn> ", "--highs", "<fn=1>\xf240</fn> "] 300,
 | 
			
		||||
          Run $ Network "wlp0s20f3" ["-t", "<fn=1>\xf1eb</fn> <fc=" ++ magenta ++ "><rx>/<tx></fc>"] 10,
 | 
			
		||||
          Run $ Date "<fn=1>\xf073</fn> %-d/%-m/%-y/%w" "date" 100000,
 | 
			
		||||
          Run $ Date "<fn=1>\xf073</fn> %-d/%-m/%-y/%w" "date" 10000,
 | 
			
		||||
          Run $ Date "%H:%M:%S" "time" 10,
 | 
			
		||||
          Run $ MPD ["-t", "<statei><title><fn=" ++ magenta ++ "> \xf001</fn>", "--", "-P", ">> ", "-Z", "|| ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
 | 
			
		||||
          Run $ Com "/home/natto/.xmonad/lib/padding-icon.sh" ["stalonetray"] "tray" 10,
 | 
			
		||||
 
 | 
			
		||||
@@ -58,13 +58,13 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
 | 
			
		||||
     spawn "/usr/bin/env dmenu_run -l 20")
 | 
			
		||||
 | 
			
		||||
  , ((shiftMask, xK_Print),
 | 
			
		||||
     spawn "flameshot gui -p /home/natto/Pictures")
 | 
			
		||||
     spawn "flameshot gui")
 | 
			
		||||
 | 
			
		||||
  , ((0, xK_Print),
 | 
			
		||||
     spawn "flameshot full -p /home/natto/Pictures")
 | 
			
		||||
 | 
			
		||||
  , ((mod1Mask, xK_Print),
 | 
			
		||||
     spawn "flameshot full -p /home/natto/Pictures -d 10000")
 | 
			
		||||
     spawn "flameshot gui -d 10000")
 | 
			
		||||
 | 
			
		||||
  , ((modMask, xK_p),
 | 
			
		||||
     spawn "mpc toggle")
 | 
			
		||||
 
 | 
			
		||||
@@ -81,9 +81,9 @@ in
 | 
			
		||||
      wineWowPackages.stable
 | 
			
		||||
      master.winetricks
 | 
			
		||||
      games.wine-discord-ipc-bridge
 | 
			
		||||
      /*  (games.osu-stable.overrideAttrs (_:{
 | 
			
		||||
        tricks = [ "gdiplus" "dotnet46" "meiryo" ];
 | 
			
		||||
        }))*/
 | 
			
		||||
      (games.osu-stable.overrideAttrs (_: {
 | 
			
		||||
        tricks = [ "gdiplus" "dotnet48" "meiryo" ];
 | 
			
		||||
      }))
 | 
			
		||||
      pmidi
 | 
			
		||||
      #   dosbox
 | 
			
		||||
      authy
 | 
			
		||||
@@ -92,21 +92,22 @@ in
 | 
			
		||||
      nbfc-linux
 | 
			
		||||
      pulseaudio
 | 
			
		||||
      (texlive.combine { inherit (texlive) scheme-small babel lm graphics-def url; })
 | 
			
		||||
      (qjackctl.override { jackSession = true; })
 | 
			
		||||
      #    carla
 | 
			
		||||
      #      electrum
 | 
			
		||||
      anki-bin
 | 
			
		||||
      spotify
 | 
			
		||||
      deluge
 | 
			
		||||
      teams
 | 
			
		||||
      libreoffice
 | 
			
		||||
#      libreoffice
 | 
			
		||||
      google-drive-ocamlfuse
 | 
			
		||||
      customscripts
 | 
			
		||||
      #     stable.ardour
 | 
			
		||||
      #     stable.calf
 | 
			
		||||
      (qjackctl.override { jackSession = true; })
 | 
			
		||||
      stable.ardour
 | 
			
		||||
      calf
 | 
			
		||||
      #     stable.blender
 | 
			
		||||
      neomutt
 | 
			
		||||
      mailcap
 | 
			
		||||
      cantata
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    file = {
 | 
			
		||||
 
 | 
			
		||||
@@ -72,14 +72,10 @@ in
 | 
			
		||||
                  name "pulse audio"
 | 
			
		||||
          }
 | 
			
		||||
          audio_output {
 | 
			
		||||
                  type "fifo"
 | 
			
		||||
                  name "Visualizer feed"
 | 
			
		||||
                  path "/tmp/g.fifo"
 | 
			
		||||
                  format "44100:16:2"
 | 
			
		||||
          }
 | 
			
		||||
          audio_output {
 | 
			
		||||
                  encoder     "vorbis"
 | 
			
		||||
                  type        "httpd"
 | 
			
		||||
                  name        "My HTTP Stream"
 | 
			
		||||
                  quality     "9"
 | 
			
		||||
                  name        "Vorbis Stream"
 | 
			
		||||
                  port        "8000"
 | 
			
		||||
                  max_clients "4"
 | 
			
		||||
          }
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,7 @@
 | 
			
		||||
      ./networking.nix
 | 
			
		||||
      ./boot.nix
 | 
			
		||||
      ./services.nix
 | 
			
		||||
      ./nix.nix
 | 
			
		||||
    ];
 | 
			
		||||
  system.stateVersion = "21.05";
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
 | 
			
		||||
  fileSystems."/boot/efi" =
 | 
			
		||||
    {
 | 
			
		||||
      device = "/dev/disk/by-uuid/58B1-4631";
 | 
			
		||||
      device = "/dev/disk/by-uuid/ACBA-9B3F";
 | 
			
		||||
      fsType = "vfat";
 | 
			
		||||
    };
 | 
			
		||||
  fileSystems."/mnt/Games" =
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								hosts/satori/nix.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								hosts/satori/nix.nix
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,21 @@
 | 
			
		||||
{ config, pkgs, ... }:
 | 
			
		||||
{
 | 
			
		||||
  nix = {
 | 
			
		||||
    package = pkgs.nixUnstable;
 | 
			
		||||
    extraOptions = ''
 | 
			
		||||
      experimental-features = nix-command flakes
 | 
			
		||||
    '';
 | 
			
		||||
    settings = {
 | 
			
		||||
      trusted-users = [ "root" "natto" ];
 | 
			
		||||
      substituters = [
 | 
			
		||||
        "https://nix-gaming.cachix.org"
 | 
			
		||||
        "https://nix-community.cachix.org"
 | 
			
		||||
        "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
 | 
			
		||||
      ];
 | 
			
		||||
      trusted-public-keys = [
 | 
			
		||||
        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
 | 
			
		||||
        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
 | 
			
		||||
      ];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
@@ -29,11 +29,10 @@
 | 
			
		||||
    ccls
 | 
			
		||||
    clang-tools
 | 
			
		||||
    nodePackages.typescript-language-server
 | 
			
		||||
    nodePackages.svelte-language-server
 | 
			
		||||
    nodePackages.vscode-langservers-extracted
 | 
			
		||||
    rnix-lsp
 | 
			
		||||
    python3Packages.python-lsp-server
 | 
			
		||||
    haskell-language-server
 | 
			
		||||
    fly
 | 
			
		||||
    (steam.override {
 | 
			
		||||
      extraLibraries = pkgs: [ pkgs.pipewire ];
 | 
			
		||||
      extraProfile = ''
 | 
			
		||||
@@ -113,21 +112,6 @@
 | 
			
		||||
        };
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  nix = {
 | 
			
		||||
    package = pkgs.nixUnstable;
 | 
			
		||||
    extraOptions = ''
 | 
			
		||||
      experimental-features = nix-command flakes
 | 
			
		||||
    '';
 | 
			
		||||
    trustedUsers = [ "root" "natto" ];
 | 
			
		||||
    binaryCaches = [
 | 
			
		||||
      "https://nix-gaming.cachix.org"
 | 
			
		||||
      "https://nix-community.cachix.org"
 | 
			
		||||
      "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
 | 
			
		||||
    ];
 | 
			
		||||
    binaryCachePublicKeys = [
 | 
			
		||||
      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
 | 
			
		||||
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
 | 
			
		||||
    ];
 | 
			
		||||
    slock.enable = true;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -14,13 +14,6 @@
 | 
			
		||||
    '';
 | 
			
		||||
  };
 | 
			
		||||
  systemd.enableUnifiedCgroupHierarchy = false;
 | 
			
		||||
  systemd.services = {
 | 
			
		||||
    tor.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    logmein-hamachi.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    openssh.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    #printing.wantedBy = lib.mkForce [];
 | 
			
		||||
    #vault.wantedBy = lib.mkForce [];
 | 
			
		||||
  };
 | 
			
		||||
  security.pki.certificateFiles = [ ../../cert.pem ];
 | 
			
		||||
  virtualisation.libvirtd = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
 
 | 
			
		||||
@@ -26,10 +26,10 @@ in
 | 
			
		||||
          nvidiaBusId = "PCI:1:0:0";
 | 
			
		||||
        };
 | 
			
		||||
        modesetting = { enable = true; };
 | 
			
		||||
        powerManagement = {
 | 
			
		||||
 /*       powerManagement = {
 | 
			
		||||
          enable = true;
 | 
			
		||||
          finegrained = true;
 | 
			
		||||
        };
 | 
			
		||||
        };*/
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
    services.xserver = {
 | 
			
		||||
 
 | 
			
		||||
@@ -17,11 +17,14 @@
 | 
			
		||||
      packages.myVimPackage = with pkgs.unstable.vimPlugins; {
 | 
			
		||||
        start = [
 | 
			
		||||
          nvim-colorizer-lua
 | 
			
		||||
          bracey-vim
 | 
			
		||||
          auto-pairs 
 | 
			
		||||
          vim-floaterm 
 | 
			
		||||
          vim-closetag
 | 
			
		||||
          nerdcommenter
 | 
			
		||||
          nvim-cmp
 | 
			
		||||
          luasnip
 | 
			
		||||
          friendly-snippets
 | 
			
		||||
          cmp_luasnip
 | 
			
		||||
          cmp-nvim-lsp
 | 
			
		||||
          cmp-path
 | 
			
		||||
@@ -34,7 +37,6 @@
 | 
			
		||||
          presence-nvim
 | 
			
		||||
          nvim-web-devicons
 | 
			
		||||
          nvim-tree-lua
 | 
			
		||||
          luasnip
 | 
			
		||||
          nvim-treesitter
 | 
			
		||||
          vim-latex-live-preview
 | 
			
		||||
          lspkind-nvim
 | 
			
		||||
 
 | 
			
		||||
@@ -196,7 +196,7 @@ vim.g.livepreview_previewer = "zathura"
 | 
			
		||||
 | 
			
		||||
require'colorizer'.setup()
 | 
			
		||||
 | 
			
		||||
--lsp and compe stuff i got from various places
 | 
			
		||||
--lsp and cmp stuff i got from various places
 | 
			
		||||
local on_attach = function(client, bufnr)
 | 
			
		||||
  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
 | 
			
		||||
  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 | 
			
		||||
@@ -209,7 +209,7 @@ local on_attach = function(client, bufnr)
 | 
			
		||||
  buf_set_keymap('n', "<M-f>", "<cmd>lua vim.lsp.buf.formatting()<CR>", {silent=true, noremap=true})
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix", "terraform_lsp" }
 | 
			
		||||
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix", "terraform_lsp", "html", "cssls", "jsonls", "svelte", "gopls" }
 | 
			
		||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
 | 
			
		||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
 | 
			
		||||
capabilities.textDocument.completion.completionItem.resolveSupport = {
 | 
			
		||||
@@ -226,7 +226,15 @@ for _, lsp in ipairs(servers) do
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
--luasnip
 | 
			
		||||
local luasnip = require 'luasnip'
 | 
			
		||||
luasnip.snippets = {
 | 
			
		||||
  html = {}
 | 
			
		||||
}
 | 
			
		||||
luasnip.snippets.javascript = luasnip.snippets.html
 | 
			
		||||
luasnip.snippets.javascriptreact = luasnip.snippets.html
 | 
			
		||||
require("luasnip/loaders/from_vscode").lazy_load()
 | 
			
		||||
 | 
			
		||||
local cmp = require 'cmp'
 | 
			
		||||
cmp.setup {
 | 
			
		||||
  snippet = {
 | 
			
		||||
@@ -287,26 +295,6 @@ cmp.setup {
 | 
			
		||||
      }),
 | 
			
		||||
    },
 | 
			
		||||
}
 | 
			
		||||
  cmp.setup.cmdline('/', {
 | 
			
		||||
    sources = {
 | 
			
		||||
      { name = 'buffer' }
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
 | 
			
		||||
  cmp.setup.cmdline(':', {
 | 
			
		||||
    sources = cmp.config.sources({
 | 
			
		||||
      { name = 'path' }
 | 
			
		||||
    }, {
 | 
			
		||||
      { name = 'cmdline' }
 | 
			
		||||
    })
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
--bind("i", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true})
 | 
			
		||||
--bind("s", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true})
 | 
			
		||||
--bind("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true})
 | 
			
		||||
--bind("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true})
 | 
			
		||||
--bind("i", "<CR>", "compe#confirm('<CR>')", {expr = true, silent = true})
 | 
			
		||||
 | 
			
		||||
comm("set shortmess+=c")
 | 
			
		||||
 | 
			
		||||
@@ -365,3 +353,4 @@ vim.o.statusline = table.concat(statusline)
 | 
			
		||||
 | 
			
		||||
vim.g.tex_flavor = "latex"
 | 
			
		||||
comm("set syntax=off")
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,7 @@
 | 
			
		||||
            args = {
 | 
			
		||||
              factory.name = "support.node.driver";
 | 
			
		||||
              node.name = "Dummy-Driver";
 | 
			
		||||
              priority.driver= 8000;
 | 
			
		||||
              priority.driver = 8000;
 | 
			
		||||
            };
 | 
			
		||||
          }
 | 
			
		||||
        ];
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user