Compare commits

..

No commits in common. "573ca91f6eb1ff8d42adb5540af3982ab5c1d501" and "7ef808cdf20cbbcad34842b40299aa7f8c7c893e" have entirely different histories.

5 changed files with 24 additions and 31 deletions

View File

@ -70,11 +70,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1723399884,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724576102, "lastModified": 1723352546,
"narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1724547350, "lastModified": 1722732880,
"narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724893087, "lastModified": 1723444610,
"narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", "narHash": "sha256-WzhuUR2ZwafNzBh0VAbk3+320xd2sNWdZdjZa0S9ydY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", "rev": "a220fc3a6e144f12f0c3dc3e4d01d44c2e6b0b85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724878143, "lastModified": 1723310128,
"narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1724727824, "lastModified": 1723556749,
"narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"nixpkgs-edge": { "nixpkgs-edge": {
"locked": { "locked": {
"lastModified": 1724479785, "lastModified": 1723362943,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -37,8 +37,6 @@
#../../profiles/autossh-reverse-tunnels #../../profiles/autossh-reverse-tunnels
]; ];
time.timeZone = null; # allows imperative configuring
networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery
# Networking # Networking

View File

@ -1,7 +1,7 @@
{ lib, ... }: lib.mkMerge [ { lib, ... }: lib.mkMerge [
{ {
# Time zone and internationalisation properties. # Time zone and internationalisation properties.
time.timeZone = lib.mkDefault "Europe/Oslo"; time.timeZone = "Europe/Oslo";
i18n.defaultLocale = "en_US.utf8"; i18n.defaultLocale = "en_US.utf8";
i18n.extraLocaleSettings.LC_ADDRESS = "nb_NO.utf8"; i18n.extraLocaleSettings.LC_ADDRESS = "nb_NO.utf8";
i18n.extraLocaleSettings.LC_IDENTIFICATION = "nb_NO.utf8"; i18n.extraLocaleSettings.LC_IDENTIFICATION = "nb_NO.utf8";

View File

@ -63,8 +63,8 @@ in {
} }
_complete_jump_marks() { _complete_jump_marks() {
local curw=''${COMP_WORDS[COMP_CWORD]} local curw=''${COMP_WORDS[COMP_CWORD]}
local wordlist=($(find "$_JUMP_MARKPATH" -type l -printf "%f\n")) local wordlist=$(find "$_JUMP_MARKPATH" -type l -printf "%f\n")
COMPREPLY=($(compgen -W "''${wordlist[@]}" -- "$curw")) COMPREPLY=($(compgen -W ''\''${wordlist[@]}' -- "$curw"))
return 0 return 0
} }
complete -F _complete_jump_marks jump unmark complete -F _complete_jump_marks jump unmark

View File

@ -103,11 +103,6 @@
#home.shellAliases.mv = "mv -i"; #home.shellAliases.mv = "mv -i";
#home.shellAliases.cp = "cp -i"; #home.shellAliases.cp = "cp -i";
home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0";
home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0";
home.shellAliases.danom-build = "nom-build --system aarch64-darwin -j0";
home.shellAliases.danix-build = "nix-build --system aarch64-darwin -j0";
home.shellAliases.kaomoji = "curl -s 'https://kaomoji.ru/en/' | htmlq tr td span --text | grep . | shuf | head -n1"; home.shellAliases.kaomoji = "curl -s 'https://kaomoji.ru/en/' | htmlq tr td span --text | grep . | shuf | head -n1";
home.packages = lib.filter (x: x != null) (with pkgs; [ home.packages = lib.filter (x: x != null) (with pkgs; [