Compare commits

..

No commits in common. "3dabf9e13f8da494654e55bf73752f9adf46b613" and "5dcd4c11bb62249f4f2ebc636a6a28a01e0d8dc2" have entirely different histories.

5 changed files with 78 additions and 28 deletions

53
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"
@ -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-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1751271578, "lastModified": 1751271578,
@ -209,6 +261,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
@ -45,6 +48,7 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
hyprswitch = hyprswitch.packages.${prev.system}.default;
pwndbg-gdb-alias = prev.callPackage ./common/pwndbg-gdb-alias.nix { }; pwndbg-gdb-alias = prev.callPackage ./common/pwndbg-gdb-alias.nix { };
securecrt = prev.callPackage ./common/securecrt.nix { }; securecrt = prev.callPackage ./common/securecrt.nix { };
}; };

View File

@ -11,16 +11,16 @@
networking = { networking = {
hostName = "sisko"; hostName = "sisko";
# networkmanager.enable = true; networkmanager.enable = true;
defaultGateway = "192.168.10.1"; # defaultGateway = "192.168.10.1";
interfaces.enp14s0 = { # interfaces.enp14s0 = {
ipv4 = { # ipv4 = {
addresses = [ # addresses = [
{ address = "192.168.10.172"; prefixLength = 24; } # { address = "192.168.10.172"; prefixLength = 24; }
]; # ];
}; # };
wakeOnLan.enable = true; # wakeOnLan.enable = true;
}; # };
hostId = "b716d781"; hostId = "b716d781";
}; };
@ -28,9 +28,15 @@
sops.defaultSopsFile = ../../secrets/sisko/sisko.yaml; sops.defaultSopsFile = ../../secrets/sisko/sisko.yaml;
environment.variables = { EDITOR = "vim"; }; environment.variables = { EDITOR = "vim"; };
users.users.felixalb.extraGroups = [ "dialout" "networkmanager" "libvirtd" ]; users.users.felixalb.extraGroups = [ "dialout" "networkmanager" ];
programs = { programs = {
gamemode.enable = true;
steam = {
enable = true;
remotePlay.openFirewall = true;
};
alvr = { alvr = {
enable = true; enable = true;
package = pkgs.unstable.alvr; package = pkgs.unstable.alvr;
@ -41,20 +47,6 @@
enable = true; enable = true;
nativeMessagingHosts.packages = with pkgs; [ tridactyl-native ]; nativeMessagingHosts.packages = with pkgs; [ tridactyl-native ];
}; };
gamemode.enable = true;
steam = {
enable = true;
remotePlay.openFirewall = true;
};
virt-manager.enable = true;
};
virtualisation = {
libvirtd.enable = true;
spiceUSBRedirection.enable = true;
}; };
nixpkgs.config = { nixpkgs.config = {
@ -64,12 +56,15 @@
"spotify" "spotify"
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
"tlclient"
]; ];
permittedInsecurePackages = [ permittedInsecurePackages = [
"openssl-1.1.1w" "openssl-1.1.1w"
]; ];
}; };
services.fwupd.enable = true; services.fwupd.enable = true;
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }

View File

@ -71,7 +71,6 @@
playerctl playerctl
pwgen pwgen
restic restic
rocmPackages.clang
traceroute traceroute
w3m w3m
@ -92,7 +91,7 @@
settings.window.opacity = 0.92; settings.window.opacity = 0.92;
}; };
ncmpcpp.enable = true; ncmpcpp.enable = true;
neovim.plugins = with pkgs.vimPlugins; [ copilot-vim coc-clangd ]; neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
rbw = { rbw = {
enable = true; enable = true;
settings = { settings = {

View File

@ -43,7 +43,6 @@
}; };
programs.neovim.plugins = with pkgs.vimPlugins; [ programs.neovim.plugins = with pkgs.vimPlugins; [
coc-clangd
coc-emmet coc-emmet
copilot-vim copilot-vim
emmet-vim # Ctrl+y + , emmet-vim # Ctrl+y + ,