xserber
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{ lib, pkgs, ... }: {
|
{ inputs, lib, pkgs, ... }: {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
@@ -21,9 +21,6 @@
|
|||||||
boot.loader.systemd-boot.configurationLimit = 25;
|
boot.loader.systemd-boot.configurationLimit = 25;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
fileSystems."/media/drive".device = "/dev/disk/by-uuid/facf5a78-8872-437c-4345-50a28c894aca";
|
|
||||||
fileSystems."/media/drive".fsType = "btrfs";
|
|
||||||
|
|
||||||
hardware.graphics.enable = true;
|
hardware.graphics.enable = true;
|
||||||
hardware.graphics.enable32Bit = true;
|
hardware.graphics.enable32Bit = true;
|
||||||
|
|
||||||
@@ -38,6 +35,8 @@
|
|||||||
services.printing.enable = false;
|
services.printing.enable = false;
|
||||||
services.pipewire.enable = true;
|
services.pipewire.enable = true;
|
||||||
services.pipewire.pulse.enable = true;
|
services.pipewire.pulse.enable = true;
|
||||||
|
services.pipewire.alsa.enable = true;
|
||||||
|
services.pipewire.wireplumber.enable = true;
|
||||||
services.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
@@ -53,7 +52,7 @@
|
|||||||
programs.neovim.enable = true;
|
programs.neovim.enable = true;
|
||||||
programs.neovim.viAlias = true;
|
programs.neovim.viAlias = true;
|
||||||
programs.neovim.vimAlias = true;
|
programs.neovim.vimAlias = true;
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = false;
|
||||||
programs.git.enable = true;
|
programs.git.enable = true;
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
programs.zsh.autosuggestions.enable = true;
|
programs.zsh.autosuggestions.enable = true;
|
||||||
@@ -81,7 +80,7 @@
|
|||||||
iptables
|
iptables
|
||||||
mesa-demos
|
mesa-demos
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wireguard-tools
|
inputs.fetchit.packages.${pkgs.system}.default
|
||||||
];
|
];
|
||||||
|
|
||||||
users.users.coast.isNormalUser = true;
|
users.users.coast.isNormalUser = true;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = false;
|
||||||
services.displayManager.plasma-login-manager.enable = true;
|
services.displayManager.plasma-login-manager.enable = false;
|
||||||
|
|
||||||
#x11
|
#x11
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
services.xserver.displayManager.lightdm.greeters.gtk.enable = true;
|
services.xserver.displayManager.lightdm.greeters.gtk.enable = true;
|
||||||
|
|
||||||
#niriwm
|
#niriwm
|
||||||
programs.niri.enable = false;
|
programs.niri.enable = true;
|
||||||
programs.niri.useNautilus = true;
|
programs.niri.useNautilus = true;
|
||||||
programs.niri.package = pkgs.niri;
|
programs.niri.package = pkgs.niri;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,20 +5,20 @@
|
|||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelParams = [ "kvm-amd" ];
|
boot.kernelParams = [ "kvm-amd" "snd_hda_intel.probe_mask=1" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
fileSystems."/".device = "/dev/nvme0n1p2";
|
||||||
fileSystems."/".fsType = "ext4";
|
fileSystems."/".fsType = "ext4";
|
||||||
|
|
||||||
fileSystems."/boot".device = "/dev/disk/by-label/boot";
|
fileSystems."/boot".device = "/dev/nvme0n1p1";
|
||||||
fileSystems."/boot".fsType = "vfat";
|
fileSystems."/boot".fsType = "vfat";
|
||||||
fileSystems."/boot".options = [ "fmask=0022" "dmask=0022" ];
|
fileSystems."/boot".options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
|
||||||
fileSystems."/media/drive".device = "/dev/disk/by-uuid/facf5a78-8872-437c-4345-50a28c894aca";
|
fileSystems."/media/drive".device = "/dev/sda2";
|
||||||
fileSystems."/media/drive".fsType = "btrfs";
|
fileSystems."/media/drive".fsType = "btrfs";
|
||||||
|
|
||||||
swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
|
swapDevices = [{ device = "/dev/nvme0n1p3"; }];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|||||||
@@ -11,4 +11,5 @@
|
|||||||
http_proxy = "socks5://127.0.0.1:2080";
|
http_proxy = "socks5://127.0.0.1:2080";
|
||||||
https_proxy = "socks5://127.0.0.1:2080";
|
https_proxy = "socks5://127.0.0.1:2080";
|
||||||
};
|
};
|
||||||
|
systemd.services.jellyfin.serviceConfig.ReadWritePaths = [ "/media/drive/Albums" ];
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+70
-1
@@ -1,5 +1,42 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"fetchit": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1787118847,
|
||||||
|
"narHash": "sha256-OXkCmr9EFKUKi/ouoNPnAcnW3Z4xl59bbIdeZcx2KgQ=",
|
||||||
|
"ref": "refs/heads/master",
|
||||||
|
"rev": "cc5cdb71df3d0e209b6c95c291814a578b54f729",
|
||||||
|
"revCount": 41,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://codeberg.org/coast/fetchit"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://codeberg.org/coast/fetchit"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -22,6 +59,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1787070829,
|
||||||
|
"narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780243769,
|
"lastModified": 1780243769,
|
||||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||||
@@ -39,8 +92,24 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"fetchit": "fetchit",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs_2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
description = "4th flake";
|
description = "4th flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-26.05";
|
home-manager.url = "github:nix-community/home-manager/release-26.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
fetchit.url = "git+https://codeberg.org/coast/fetchit";
|
||||||
};
|
};
|
||||||
|
outputs = { self, nixpkgs, home-manager, fetchit, ... }@inputs: {
|
||||||
outputs = { self, nixpkgs, home-manager }: {
|
|
||||||
nixosConfigurations.unix = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.unix = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
modules =
|
modules =
|
||||||
[
|
[
|
||||||
./configuration
|
./configuration
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users.coast = import ./home-configuration/default.nix;
|
home-manager.users.coast = import ./home-configuration/default.nix;
|
||||||
home-manager.backupFileExtension = "home-backup";
|
home-manager.backupFileExtension = "home-backup";
|
||||||
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ binds {
|
|||||||
Mod+Shift+V { switch-focus-between-floating-and-tiling; }
|
Mod+Shift+V { switch-focus-between-floating-and-tiling; }
|
||||||
|
|
||||||
Mod+Shift+F { toggle-column-tabbed-display; }
|
Mod+Shift+F { toggle-column-tabbed-display; }
|
||||||
Mod+F hotkey-overlay-title="Spawn file manager (caja)" { spawn-sh "XDG_DATA_DIRS=/etc/profiles/per-user/coast/share:/run/current-system/sw/share:$HOME/.nix-profile/share:$XDG_DATA_DIRS caja"; }
|
Mod+F hotkey-overlay-title="Spawn file manager (nautilus)" { spawn-sh "XDG_DATA_DIRS=/etc/profiles/per-user/coast/share:/run/current-system/sw/share:$HOME/.nix-profile/share:$XDG_DATA_DIRS nautilus"; }
|
||||||
Print { screenshot; }
|
Print { screenshot; }
|
||||||
Super+Shift+S { screenshot; }
|
Super+Shift+S { screenshot; }
|
||||||
Control+Alt+S { screenshot-window; }
|
Control+Alt+S { screenshot-window; }
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
|
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
|
||||||
"comfy-line-numbers.nvim": { "branch": "main", "commit": "9adedbaf1f410cdaacf4fb2ca8eb44f3d5f6d010" },
|
"comfy-line-numbers.nvim": { "branch": "main", "commit": "9adedbaf1f410cdaacf4fb2ca8eb44f3d5f6d010" },
|
||||||
"fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
|
"fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||||
"lsp_signature.nvim": { "branch": "master", "commit": "b7ace9ddb1640ce266012a45a672dfdaedfa5ec6" },
|
"lsp_signature.nvim": { "branch": "master", "commit": "b7ace9ddb1640ce266012a45a672dfdaedfa5ec6" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
|
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" },
|
"mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" },
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ in
|
|||||||
./managed/git
|
./managed/git
|
||||||
./managed/prismlauncher
|
./managed/prismlauncher
|
||||||
./managed/obs-studio
|
./managed/obs-studio
|
||||||
|
./managed/xserver
|
||||||
];
|
];
|
||||||
home.username = "coast";
|
home.username = "coast";
|
||||||
home.homeDirectory = "/home/coast";
|
home.homeDirectory = "/home/coast";
|
||||||
@@ -25,7 +26,6 @@ in
|
|||||||
xdg.configFile = builtins.mapAttrs
|
xdg.configFile = builtins.mapAttrs
|
||||||
(key: subpath: {
|
(key: subpath: {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Configuration/home-configuration/config/${subpath}";
|
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Configuration/home-configuration/config/${subpath}";
|
||||||
recursive = true;
|
|
||||||
})
|
})
|
||||||
configs;
|
configs;
|
||||||
|
|
||||||
@@ -61,7 +61,6 @@ in
|
|||||||
pkgs.nixpkgs-fmt
|
pkgs.nixpkgs-fmt
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
pkgs.nautilus
|
pkgs.nautilus
|
||||||
pkgs.caja
|
|
||||||
pkgs.xray
|
pkgs.xray
|
||||||
pkgs.git
|
pkgs.git
|
||||||
pkgs.gnumake
|
pkgs.gnumake
|
||||||
@@ -98,6 +97,7 @@ in
|
|||||||
pkgs.obs-cmd
|
pkgs.obs-cmd
|
||||||
pkgs.gedit
|
pkgs.gedit
|
||||||
pkgs.feishin
|
pkgs.feishin
|
||||||
|
pkgs.alsa-utils
|
||||||
pkgs.gnome-themes-extra
|
pkgs.gnome-themes-extra
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
pname = "prismlauncher";
|
pname = "prismlauncher";
|
||||||
version = "11.0.2-1";
|
version = "11.0.3";
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://github.com/Diegiwg/PrismLauncher-Cracked/releases/download/${version}/PrismLauncher-Linux-x86_64.AppImage";
|
url = "https://github.com/Diegiwg/PrismLauncher-Cracked/releases/download/${version}/PrismLauncher-Linux-x86_64.AppImage";
|
||||||
hash = "sha256-P+6s4g8uCqXQx0p5rieJFpuDV7AquGVYrcTs9XWFAsA=";
|
hash = "sha256:7559471672cbb36fb6e2159d894a96d9a56da563770dc74b982d84927ee56be0";
|
||||||
};
|
};
|
||||||
icon = pkgs.fetchurl {
|
icon = pkgs.fetchurl {
|
||||||
url = "https://upload.wikimedia.org/wikipedia/commons/7/74/Prism_Launcher_logo.svg";
|
url = "https://upload.wikimedia.org/wikipedia/commons/7/74/Prism_Launcher_logo.svg";
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
xsession.windowManager.bspwm.enable = true;
|
||||||
|
xsession.windowManager.bspwm.package = pkgs.bspwm-unstable;
|
||||||
|
xsession.windowManager.bspwm.settings = {
|
||||||
|
border_width = 2;
|
||||||
|
focused_border_color = "#383838";
|
||||||
|
normal_border_color = "#282828";
|
||||||
|
window_gap = 10;
|
||||||
|
split_ratiop = 0.5;
|
||||||
|
smart_gap = true;
|
||||||
|
focus_follows_pointer = false;
|
||||||
|
click_to_focus = true;
|
||||||
|
pointer_follows_monitor = true;
|
||||||
|
remove_disabled_monitors = true;
|
||||||
|
auto_cancel = true;
|
||||||
|
auto_alternate = true;
|
||||||
|
bottom_padding = 0;
|
||||||
|
};
|
||||||
|
xsession.windowManager.bspwm.extraConfig = ''
|
||||||
|
pidb() {
|
||||||
|
pgrep -x "$1" >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
run() {
|
||||||
|
proc="$1"
|
||||||
|
cmd="$2"
|
||||||
|
|
||||||
|
if ! pidb "$proc"; then
|
||||||
|
sh -c "$cmd" &
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
### }}}
|
||||||
|
|
||||||
|
|
||||||
|
### {{{ rerun/start processes
|
||||||
|
|
||||||
|
# piss
|
||||||
|
run "piss" "piss"
|
||||||
|
|
||||||
|
# picom
|
||||||
|
run "picom" "picom --backend glx"
|
||||||
|
|
||||||
|
# dunst
|
||||||
|
# run "dunst" "dunst"
|
||||||
|
|
||||||
|
# bspbar
|
||||||
|
# run "bspbar" "bspbar"
|
||||||
|
|
||||||
|
xwallpaper --center "$HOME/Wallpapers/nature2art.png"
|
||||||
|
'';
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user