cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

configuring adampad/adam

Browse Source
This commit is contained in:
cnst
2024-07-25 19:01:42 +02:00
parent c779c2a580
commit 29da8ca94a
10 changed files with 189 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
flake.lock generated
View File

@@ -89,11 +89,11 @@
]
},
"locked": {
"lastModified": 1721783041,
"narHash": "sha256-1QFh73X8yHqwA8hEmryXCajk3HU3NR+Q5bSf6HrSAw8=",
"lastModified": 1721869586,
"narHash": "sha256-q1UcW2tORsyev+oFFNFVUnV1Ah5BAkmEKgbiQkFGeHM=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"rev": "d6c0b8797082dafa5d0635f2bac55bdca9d10757",
"rev": "f815559dedafdb4a813dcac757085fc8d6491267",
"type": "github"
},
"original": {
@@ -263,6 +263,24 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
@@ -339,11 +357,11 @@
},
"hardware": {
"locked": {
"lastModified": 1721754224,
"narHash": "sha256-JEVfxzZRo+/zdWKBjHpAUG905SDZL9fmoLJxf9b5CGU=",
"lastModified": 1721839713,
"narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "405b654893aba16c8014de6a17e84439d3fb8e46",
"rev": "a7432ebaefc9a400dcda399d48b949230378d784",
"type": "github"
},
"original": {
@@ -359,11 +377,11 @@
]
},
"locked": {
"lastModified": 1721804110,
"narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=",
"lastModified": 1721852138,
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c",
"rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
"type": "github"
},
"original": {
@@ -523,11 +541,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1721548954,
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
"lastModified": 1721686456,
"narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
"rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b",
"type": "github"
},
"original": {
@@ -569,6 +587,22 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1716097317,
"narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@@ -583,11 +617,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721772245,
"narHash": "sha256-//9p3Qm8gLbPUTsSGN2EMYkDwE5Sqq9B9P2X/z2+npw=",
"lastModified": 1721854976,
"narHash": "sha256-iWTGRfYoq0ppT3P4D2bRDVkLuTZAzuud/gsxVzPTHDg=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "ab67ee7e8b33e788fc53d26dc6f423f9358e3e66",
"rev": "216d64c158da5523d5b3db0895e1345175c21502",
"type": "github"
},
"original": {
@@ -634,7 +668,8 @@
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim",
"systems": "systems_5"
"systems": "systems_5",
"yazi": "yazi"
}
},
"rust-overlay": {
@@ -662,6 +697,31 @@
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"yazi",
"flake-utils"
],
"nixpkgs": [
"yazi",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716085073,
"narHash": "sha256-3+9gI93XxszWA2+9S2xZfws1QArPX/MC6nahOGpcMB4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cfc8776011bd83508324115d353222475e1601c0",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
@@ -737,6 +797,21 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@@ -757,6 +832,26 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"yazi": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1721865264,
"narHash": "sha256-/VFP+pvWWQRj6FBHfZUkaLuC66e2drD87kzBZrbuaZc=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "152b9ea75e12409bbe679be8a712624d1e60eb9f",
"type": "github"
},
"original": {
"owner": "sxyazi",
"repo": "yazi",
"type": "github"
}
}
},
"root": "root",

2
home/core/gui/utility/default.nix
View File

@@ -29,6 +29,6 @@
slurp # select region for screenshot
qbittorrent
networkmanagerapplet # tray icon for NetworkManager
usbimager
usbimager # write bootable usb images!
];
}

8
home/core/tui/shell/adam.nix
View File

@@ -10,10 +10,10 @@
nixdev = "nix develop ~/.nix-config -c $SHELL";
nixconfig = "cd /home/adam/.nix-config/";
ll = "ls -l";
nixupdate = "nh os switch -v -H cnix";
nixup = "nh os switch -H cnix";
flakeupdate = "nh os switch -u -v -H cnix";
flakeup = "nh os switch -u -H cnix";
nixupdate = "nh os switch -v -H adampad";
nixup = "nh os switch -H adampad";
flakeupdate = "nh os switch -u -v -H adampad";
flakeup = "nh os switch -u -H adampad";
};
history = {
size = 1000;

31
home/users/adam/imports.nix
View File

@@ -3,49 +3,41 @@
# core.gui
../../core/gui/gtk
../../core/gui/waybar
# ../../core/gui/ags
../../core/gui/browsers
../../core/gui/xdg
../../core/gui/discord
../../core/gui/hypr
../../core/gui/utility
# core.tui
../../core/tui/git/adam.nix
../../core/tui/git/cnst.nix
../../core/tui/shell/adam.nix
../../core/tui/foot
../../core/tui/alacritty
../../core/tui/neovim
# ../../core/tui/yazi
# core.services
../../core/services/mako
../../core/services/polkit
../../core/services/hypr
# ../../core/services/power-monitor
];
home = {
packages = with pkgs; [
# misc.gui
file-roller
gnome-calculator
keepassxc
nwg-look
oculante
pavucontrol
qbittorrent
virt-manager
xfce.thunar
nautilus
# misc.tui
alacritty
btop
calcurse
fastfetch
htop
ranger
xcur2png
# misc.system
bun
adwaita-icon-theme
grimblast
hyprpicker
networkmanagerapplet
pamixer
qt5.qtwayland
qt6.qtwayland
slurp
# thefuck
wireguard-tools
wl-clipboard
@@ -57,6 +49,9 @@
BROWSER = "firefox";
EDITOR = "nvim";
TERM = "foot";
QT_QPA_PLATFORM = "wayland";
SDL_VIDEODRIVER = "wayland";
XDG_SESSION_TYPE = "wayland";
};
};
}

1
home/users/cnst/imports.nix
View File

@@ -15,6 +15,7 @@
../../core/tui/foot
../../core/tui/alacritty
../../core/tui/neovim
../../core/tui/yazi
# core.services
../../core/services/mako
../../core/services/polkit

9
nixos/hosts/adampad/default.nix
View File

@@ -9,7 +9,7 @@
}: let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
users.users.adam = {
users.users.cnst = {
isNormalUser = true;
shell = pkgs.zsh;
# openssh.authorizedKeys.keys = [];
@@ -25,6 +25,7 @@ in {
"qemu-libvirtd"
"kvm"
"network"
"gamemode"
"adbusers"
"rtkit"
"users"
@@ -72,12 +73,6 @@ in {
efi.canTouchEfiVariables = true;
};
# Enable networking
networking = {
networkmanager.enable = true;
hostName = "adampad";
};
environment.sessionVariables = {
FLAKE = "/home/adam/.nix-config";
};

1
nixos/hosts/adampad/hardware-configuration.nix
View File

@@ -28,7 +28,6 @@
kernelParams = [
"quiet"
"splash"
"amdgpu.ppfeaturemask=0xffffffff"
];
extraModulePackages = [];
};

56
nixos/hosts/adampad/imports.nix
View File

@@ -3,31 +3,34 @@
# core
../../core/fonts.nix
../../core/hyprland.nix
../../core/networking.nix
../../core/zsh.nix
# hardware
../../hardware/adampad.nix
../../hardware/cnix.nix
# locale
../../locale
# services
../../services/blueman.nix
../../services/dbus.nix
../../services/gnome-keyring.nix
../../services/greetd.nix
../../services/gvfs.nix
../../services/mullvad.nix
../../services/openssh.nix
../../services/pipewire.nix
../../services/udisks.nix
../../services/xserver-adampad.nix
../../services/locate.nix
../../services/fwupd.nix
../../services/blueman
../../services/dbus
../../services/gnome-keyring
../../services/greetd
../../services/gvfs
../../services/locate
../../services/mullvad
../../services/openssh
../../services/audio
../../services/power
../../services/samba
../../services/udisks
../../services/fwupd
../../services/xserver/adampad.nix
# extra
../../extra/android
# ../../extra/gaming.nix
../../extra/android
# ../../extra/workstation
# ../../extra/nix-ld
];
@@ -41,13 +44,13 @@
nix-output-monitor
nvd
sbctl
rocmPackages.rocm-smi
# Util
anyrun
curl
fzf
gnome-disk-utility
killall
lazygit
ntfs3g
p7zip
@@ -74,12 +77,33 @@
gcc
gnumake
cmake
hyprlang
python3
python312Packages.httplib2
python312Packages.oauth2
gtk3
gtk4
# misc.language_servers
typescript-language-server
typescript
nixd
nil
statix
hyprlang
alejandra
nixpkgs-fmt
pyright
isort
rustfmt
rust-analyzer
clippy
lua-language-server
stylua
nodePackages_latest.nodejs
nodePackages.prettier
prettierd
black
vimPlugins.nvim-treesitter-parsers.typescript
];
};
}

6
nixos/hosts/adampad/system.nix
View File

@@ -11,7 +11,11 @@
flake = "/home/adam/.nix-config";
};
};
security.rtkit.enable = true;
security = {
rtkit.enable = true;
pam.services.hyprlock = {};
};
environment.localBinInPath = true;

22
nixos/services/xserver/adampad.nix
View File

@@ -2,16 +2,16 @@
services.xserver = {
enable = true;
videoDrivers = ["amdgpu"];
xkb = {
extraLayouts.hhkbse = {
description = "HHKBse by cnst";
languages = ["se"];
symbolsFile = /home/cnst/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse;
};
layout = "hhkbse";
# dir = "/home/cnst/.nix-config/nixos/xkb";
variant = "";
options = "lv3:rwin_switch";
};
# xkb = {
# extraLayouts.hhkbse = {
# description = "HHKBse by cnst";
# languages = ["se"];
# symbolsFile = /home/cnst/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse;
# };
# layout = "hhkbse";
# # dir = "/home/cnst/.nix-config/nixos/xkb";
# variant = "";
# options = "lv3:rwin_switch";
# };
};
}