Compare commits

..

No commits in common. "04325f9867c193f9f77ebc3f7834db25404dc449" and "0f9d39a08b1c43fa69d35a4364b3a7d7a7de6ddc" have entirely different histories.

5 changed files with 43 additions and 33 deletions

View file

@ -129,9 +129,9 @@
programs.waybar = { programs.waybar = {
enable = true; enable = true;
#package = pkgs.waybar.overrideAttrs (oldAttrs: { package = pkgs.waybar.overrideAttrs (oldAttrs: {
# mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
#}); });
#config = { #config = {
# modules = [{module = "wlr/workspace"};]; # modules = [{module = "wlr/workspace"};];
#}; #};

View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1716561646, "lastModified": 1715290355,
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717525419, "lastModified": 1713566308,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "rev": "057117a401a34259c9615ce62218aea7afdee4d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717196966, "lastModified": 1716293225,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,12 +124,29 @@
"type": "github" "type": "github"
} }
}, },
"nvidia-beta": {
"locked": {
"lastModified": 1716316820,
"narHash": "sha256-mcbyy0lbUYuPbNIggb2Fy020iJhs7uI5Vfny3pVsSqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"flatpaks": "flatpaks", "flatpaks": "flatpaks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nvidia-beta": "nvidia-beta"
} }
}, },
"systems": { "systems": {

View file

@ -2,8 +2,11 @@
inputs = { inputs = {
# ... # ...
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nvidia-beta.url = "github:NixOS/nixpkgs/d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db";
flatpaks.url = "github:GermanBread/declarative-flatpak/dev"; flatpaks.url = "github:GermanBread/declarative-flatpak/dev";
flatpaks.inputs.nixpkgs.follows = "nixpkgs"; flatpaks.inputs.nixpkgs.follows = "nixpkgs";
#hyprland.url = "github:hyprwm/Hyprland";
#hyprland.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
home-manager = { home-manager = {

View file

@ -280,15 +280,6 @@
}; };
}; };
keybindings = let
modifier = config.wayland.windowManager.sway.config.modifier;
in lib.mkOptionDefault {
#"''${modifier}+Return" = "exec ${cfg.config.terminal}";
"${modifier}+c" = "kill";
"${modifier}+r" = "exec ${config.wayland.windowManager.sway.config.menu}";
"${modifier}+p" = "exec grim -g \"\$(slurp)\" - | wl-copy";
"${modifier}+v" = "floating toggle";
};
startup = [ startup = [
# Launch Firefox on start # Launch Firefox on start
{command = "wayvnc 100.120.210.58";} {command = "wayvnc 100.120.210.58";}
@ -326,8 +317,7 @@ set $surface1 #51576d
set $surface0 #414559 set $surface0 #414559
set $base #303446 set $base #303446
set $mantle #292c3c set $mantle #292c3c
set $crust #232634 set $crust #232634'';
seat seat0 xcursor_theme Catppuccin-Frappe-Blue-Cursors'';
}; };
home.stateVersion = "23.05"; home.stateVersion = "23.05";

View file

@ -3,15 +3,15 @@
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = inputs.nixpkgs;
networking.hostName = "insertpclinux"; networking.hostName = "insertpclinux";
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
#nixpkgs.overlays = [ (self: super: (let nixpkgs.overlays = [ (self: super: (let
# patched_pkgs = import inputs.nvidia-beta { patched_pkgs = import inputs.nvidia-beta {
# inherit (self) system; inherit (self) system;
# config.allowUnfree = true; config.allowUnfree = true;
# }; };
# in { in {
# linuxPackages = patched_pkgs.linuxPackages; linuxPackages = patched_pkgs.linuxPackages;
# })) ]; })) ];
#boot.kernelPackages = pkgs.linuxPackages; boot.kernelPackages = pkgs.linuxPackages;
services.sunshine = { services.sunshine = {
enable = true; enable = true;