specCon18/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added bluetooth and xremap and screenshots

Browse source
This commit is contained in:
specCon18 2023-12-20 06:07:08 -05:00
parent 3449e5a858
commit 6baa7c361c
8 changed files with 371 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

332
flake.lock generated
View file

@ -1,5 +1,45 @@
{ {
"nodes": { "nodes": {
"crane": {
"inputs": {
"nixpkgs": [
"xremap",
"nixpkgs"
]
},
"locked": {
"lastModified": 1701386725,
"narHash": "sha256-w4aBlMYh9Y8co1V80m5LzEKMijUJ7CBTq209WbqVwUU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "8b9bad9b30bd7a9ed08782e64846b7485f9d0a38",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": {
"inputs": {
"nixpkgs": "nixpkgs_4",
"systems": "systems_2"
},
"locked": {
"lastModified": 1700815693,
"narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=",
"owner": "numtide",
"repo": "devshell",
"rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -20,6 +60,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -41,6 +99,24 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1701071203,
"narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
@ -88,6 +164,55 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-protocols_2": {
"inputs": {
"nixpkgs": [
"xremap",
"hyprland",
"nixpkgs"
],
"systems": [
"xremap",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland_2": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"nixpkgs": "nixpkgs_6",
"systems": "systems_3",
"wlroots": "wlroots_2",
"xdph": "xdph_2"
},
"locked": {
"lastModified": 1701370414,
"narHash": "sha256-Q7A8BWWS1YndiNaAKM0IP73SGKJiQDfOdZAIdTLGNj8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b394c1695c05cf3b2133a473aa459d4cd750911b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1679765008, "lastModified": 1679765008,
@ -120,6 +245,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1679748960, "lastModified": 1679748960,
@ -168,6 +311,70 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1677383253,
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1700794826,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1701336116,
"narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
@ -175,7 +382,8 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"xremap": "xremap"
} }
}, },
"sops-nix": { "sops-nix": {
@ -212,6 +420,36 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -231,6 +469,25 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"wlroots_2": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1701368958,
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
@ -259,6 +516,79 @@
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"type": "github" "type": "github"
} }
},
"xdph_2": {
"inputs": {
"hyprland-protocols": [
"xremap",
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"xremap",
"hyprland",
"nixpkgs"
],
"systems": [
"xremap",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1700508250,
"narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
},
"xremap": {
"inputs": {
"crane": "crane",
"devshell": "devshell",
"flake-parts": "flake-parts",
"home-manager": "home-manager_2",
"hyprland": "hyprland_2",
"nixpkgs": "nixpkgs_7",
"xremap": "xremap_2"
},
"locked": {
"lastModified": 1701816620,
"narHash": "sha256-axgWrKpoV1T7KVbbT+3H/Q6mcBdUKylIz6ClFCMRxlA=",
"owner": "xremap",
"repo": "nix-flake",
"rev": "5b264392686e6caee50c9b12cb290b7d0f23cf93",
"type": "github"
},
"original": {
"owner": "xremap",
"repo": "nix-flake",
"type": "github"
}
},
"xremap_2": {
"flake": false,
"locked": {
"lastModified": 1701234505,
"narHash": "sha256-7k6GsKDUBvhKL9JU/QkWO+IHvhaty1udOYP8fXKr9QY=",
"owner": "k0kubun",
"repo": "xremap",
"rev": "97268d1d92d94609daddff1230c4ca77d54a84dd",
"type": "github"
},
"original": {
"owner": "k0kubun",
"ref": "v0.8.12",
"repo": "xremap",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

8
flake.nix
View file

@ -4,7 +4,8 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = "github:Mic92/sops-nix";
xremap.url = "github:xremap/nix-flake";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.05";
@ -16,7 +17,7 @@
}; };
}; };
outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, hyprland, ... }@inputs: outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, hyprland, xremap, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -33,6 +34,8 @@
modules = [ modules = [
#Secrets management #Secrets management
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
#Keybinding
xremap.nixosModules.default
#Machine config #Machine config
configurationNix configurationNix
defaultNixOptions defaultNixOptions
@ -64,6 +67,7 @@
./modules/system/desktop-environments/tuigreet.nix ./modules/system/desktop-environments/tuigreet.nix
./modules/system/desktop-environments/hyprland.nix ./modules/system/desktop-environments/hyprland.nix
./hosts/katana/default.nix ./hosts/katana/default.nix
./hosts/katana/bluetooth.nix
./hosts/katana/networkd.nix ./hosts/katana/networkd.nix
./hosts/katana/system-pkgs.nix ./hosts/katana/system-pkgs.nix
./modules/system/services/docker.nix ./modules/system/services/docker.nix

24
hosts/katana/bluetooth.nix
View file

@ -1,13 +1,13 @@
{config, pkgs, }: {config, pkgs, ... }:
{ {
hardware.bluetooth = { hardware.bluetooth = {
enable = true; # enables support for Bluetooth enable = true; # enables support for Bluetooth
powerOnBoot = true; # powers up the default Bluetooth controller on boot powerOnBoot = true; # powers up the default Bluetooth controller on boot
settings = { settings = {
General = { General = {
Enable = "Source,Sink,Media,Socket"; Enable = "Source,Sink,Media,Socket";
}; };
}; };
}; };
services.blueman.enable = true; services.blueman.enable = true;
} }

1
hosts/katana/system-pkgs.nix
View file

@ -35,5 +35,6 @@
rofi rofi
prismlauncher prismlauncher
parallel parallel
skate
]; ];
} }

2
modules/home-manager/hyprland.nix
View file

@ -34,6 +34,8 @@
bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod, Print, exec, grim -o /home/speccon18/Pictures/$(date +'%s_grim.png') -g "$(slurp)" -t png
# Startup Runners # Startup Runners
exec-once=systemctl --user start waybar.service exec-once=systemctl --user start waybar.service
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

4
modules/system/desktop-environments/hyprland.nix
View file

@ -27,6 +27,10 @@ in {
hyprland hyprland
font-awesome font-awesome
brightnessctl brightnessctl
grim
slurp
imagemagick
wl-clipboard
]; ];
sessionVariables = { sessionVariables = {
#Enable Wayland #Enable Wayland

14
users/speccon18/default.nix
View file

@ -14,4 +14,18 @@
"docker" "docker"
]; ];
}; };
services.xremap = {
withWlroots = true;
userName = "speccon18";
config = {
keymap = [
{
name = "Global";
remap = {
"CapsLock" = "Esc";
};
}
];
};
};
} }

1
users/speccon18/home.nix
View file

@ -29,6 +29,7 @@
vlc vlc
remmina remmina
bacon bacon
skate
]; ];
}; };
} }