2
2
mirror of https://git.feal.no/felixalb/nixos-config.git synced 2024-12-22 12:07:29 +01:00

Compare commits

...

2 Commits

7 changed files with 95 additions and 15 deletions

71
flake.lock generated
View File

@ -31,6 +31,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -56,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732466619, "lastModified": 1733572789,
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f3111f62a23451114433888902a55cf0692b408d", "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,6 +88,28 @@
"type": "github" "type": "github"
} }
}, },
"hyprswitch": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1732716329,
"narHash": "sha256-e/t8CD7HXnRziDgA+iT2eMzj2VypvFoZeTILngHFet0=",
"owner": "H3rmt",
"repo": "hyprswitch",
"rev": "8e1d741aa0cca12f5920c77adf3dc784f20456cc",
"type": "github"
},
"original": {
"owner": "H3rmt",
"ref": "v3.1.3",
"repo": "hyprswitch",
"type": "github"
}
},
"matrix-synapse-next": { "matrix-synapse-next": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -157,6 +197,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1733096140,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710628718, "lastModified": 1710628718,
@ -175,11 +227,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1733759999,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +259,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733261153, "lastModified": 1733550349,
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,6 +277,7 @@
"inputs": { "inputs": {
"extra-config": "extra-config", "extra-config": "extra-config",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprswitch": "hyprswitch",
"matrix-synapse-next": "matrix-synapse-next", "matrix-synapse-next": "matrix-synapse-next",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",

View File

@ -14,6 +14,8 @@
matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0"; matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
nix-minecraft.url = "github:Infinidoge/nix-minecraft"; nix-minecraft.url = "github:Infinidoge/nix-minecraft";
hyprswitch.url = "github:H3rmt/hyprswitch/v3.1.3";
hyprswitch.inputs.nixpkgs.follows = "nixpkgs";
extra-config.url = "git+file:///home/felixalb/nix-extra-config"; extra-config.url = "git+file:///home/felixalb/nix-extra-config";
@ -24,6 +26,7 @@
outputs = { outputs = {
self self
, home-manager , home-manager
, hyprswitch
, matrix-synapse-next , matrix-synapse-next
, nix-minecraft , nix-minecraft
, nix-darwin , nix-darwin
@ -44,6 +47,8 @@
system = prev.system; system = prev.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
hyprswitch = hyprswitch.packages.${prev.system}.default;
}; };
in in
{ {

View File

@ -22,6 +22,11 @@
domain = "it.ntnu.no"; domain = "it.ntnu.no";
hostId = "f458d6aa"; hostId = "f458d6aa";
search = [
"it.ntnu.no"
"ntnu.no"
];
# Allow SSH from IT and SSH gateways # Allow SSH from IT and SSH gateways
firewall.extraCommands = '' firewall.extraCommands = ''
# IT VPN # IT VPN

View File

@ -58,7 +58,7 @@ in {
settings = { settings = {
base_url = "https://bitwarden.it.ntnu.no"; base_url = "https://bitwarden.it.ntnu.no";
email = emailAddress; email = emailAddress;
pinentry = pkgs.pinentry-gnome3; pinentry = pkgs.pinentry-rofi;
}; };
}; };
rofi = { rofi = {

View File

@ -12,11 +12,14 @@
networking = { networking = {
hostName = "sisko"; hostName = "sisko";
defaultGateway = "192.168.10.1"; defaultGateway = "192.168.10.1";
interfaces.enp14s0.ipv4 = { interfaces.enp14s0 = {
ipv4 = {
addresses = [ addresses = [
{ address = "192.168.10.172"; prefixLength = 24; } { address = "192.168.10.172"; prefixLength = 24; }
]; ];
}; };
wakeOnLan.enable = true;
};
hostId = "b716d781"; hostId = "b716d781";
}; };

View File

@ -5,6 +5,7 @@
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
}; };
hardware.amdgpu.opencl.enable = true;
services.displayManager.ly.enable = true; services.displayManager.ly.enable = true;
services.xserver.enable = true; services.xserver.enable = true;

View File

@ -11,6 +11,7 @@
chromium chromium
discord discord
element-desktop element-desktop
papers
jellyfin-media-player jellyfin-media-player
kitty kitty
libreoffice libreoffice
@ -18,6 +19,7 @@
mumble mumble
pavucontrol pavucontrol
prismlauncher prismlauncher
swayimg
# Window Manager Extras # Window Manager Extras
bibata-cursors bibata-cursors
@ -26,11 +28,14 @@
hyprlock hyprlock
hyprpaper hyprpaper
hyprshot hyprshot
hyprswitch
nautilus nautilus
networkmanager networkmanager
rofi-rbw-wayland rofi-rbw-wayland
swaynotificationcenter swaynotificationcenter
waybar waybar
wl-clipboard
cliphist
# Misc tools # Misc tools
bc bc
@ -41,6 +46,7 @@
hunspellDicts.nb_NO hunspellDicts.nb_NO
jq jq
nixpkgs-2211.remmina nixpkgs-2211.remmina
ollama-rocm
openssl openssl
playerctl playerctl
pwgen pwgen
@ -104,7 +110,14 @@
"x-scheme-handler/https" = "firefox.desktop"; "x-scheme-handler/https" = "firefox.desktop";
"x-scheme-handler/about" = "firefox.desktop"; "x-scheme-handler/about" = "firefox.desktop";
"x-scheme-handler/unknown" = "firefox.desktop"; "x-scheme-handler/unknown" = "firefox.desktop";
};
"application/pdf" = "org.gnome.Papers.desktop";
} // builtins.listToAttrs (
builtins.map
( imgType: { name = "image/${imgType}"; value = "swayimg.desktop"; } )
[ "apng" "bmp" "gif" "heic" "heif" "jpeg" "png" "svg" "svg+xml" "tiff" ]
);
}; };
home.stateVersion = "24.11"; home.stateVersion = "24.11";