maybe i3 soon?

This commit is contained in:
MichaelFisher1997 2024-10-18 19:30:57 +01:00
parent 28e75a74d0
commit ade5504788
7 changed files with 71 additions and 220 deletions

View File

@ -13,6 +13,7 @@
./docker.nix ./docker.nix
./hyprland.nix ./hyprland.nix
./networking.nix ./networking.nix
./i3.nix
]; ];
# Bootloader. # Bootloader.
@ -21,6 +22,7 @@
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.supportedFilesystems = [ "ntfs" ];
# boot.supportedFilesystems = [ "zfs" ]; # boot.supportedFilesystems = [ "zfs" ];
# boot.zfs.forceImportRoot = false; # boot.zfs.forceImportRoot = false;
# networking.hostId = "a44f5fde"; # networking.hostId = "a44f5fde";
@ -80,7 +82,7 @@
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; #alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
@ -118,8 +120,13 @@
#hardware.opengl.driSupport = true; # This is already enabled by default #hardware.opengl.driSupport = true; # This is already enabled by default
hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
hardware.bluetooth.settings = {
General = {
Enable = "Source,Sink,Media,Socket";
};
};
#cosmic #cosmic
hardware.system76.enableAll = true; #hardware.system76.enableAll = true;
#services.desktopManager.cosmic.enable = true; #services.desktopManager.cosmic.enable = true;
#services.displayManager.cosmic-greeter.enable = true; #services.displayManager.cosmic-greeter.enable = true;

172
flake.lock generated
View File

@ -1,172 +0,0 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1717312683,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"nix-update": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724271552,
"narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=",
"owner": "Mic92",
"repo": "nix-update",
"rev": "737121eccb67542e8c004c64da833fede2e80c64",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-update",
"type": "github"
}
},
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat",
"nix-update": "nix-update",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1725068173,
"narHash": "sha256-dAPEOQOqp3PzatuvCaa1tn3S+EtM/tlFnWoKrQJ5DoY=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "6ebb742988db3f8929fcc58e97bf5de7d371c285",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1717179513,
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1724855419,
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724984647,
"narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719887753,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View File

@ -1,27 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/24.05"; # NOTE: change "unstable" to "24.05" if you are using NixOS 24.05
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, nixos-cosmic }: {
nixosConfigurations = {
"hypr-nix" = nixpkgs.lib.nixosSystem {
modules = [
{
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}
nixos-cosmic.nixosModules.default
./configuration.nix
];
};
};
};
}

21
i3.nix Normal file
View File

@ -0,0 +1,21 @@
{config, pkgs, callPackage, ... }:
{
services.xserver = {
enable = true;
desktopManager = {
xterm.enable = false;
};
windowManager.i3 = {
enable = true;
extraPackages = with pkgs; [
dmenu #application launcher most people use
i3status # gives you the default i3 status bar
i3lock #default i3 screen locker
i3blocks #if you are planning on using i3blocks over i3status
picom
];
};
};
}

22
mnt.nix
View File

@ -18,19 +18,17 @@
}; };
where = "/mnt/BigNAS"; where = "/mnt/BigNAS";
}]; }];
#fileSystems."/mnt/BigNAS" = {
# device = "10.27.27.239:/BigNAS";
# fsType = "nfs";
# options = [ "x-systemd.automount" "noauto" ];
#};
#fileSystems."/mnt/MainPool" = {
# device = "10.27.27.12:/MainPool";
# fsType = "nfs";
#};
fileSystems."/mnt/NV1" = { fileSystems."/mnt/NV1" = {
device = "/dev/nvme1n1p1"; device = "/dev/disk/by-uuid/a41cc08d-10f2-40dd-b76a-976764a50cea";
fsType = "btrfs"; fsType = "btrfs";
}; };
fileSystems."/mnt/ssd2" = {
device = "/dev/disk/by-uuid/bc0d1423-5682-4150-906f-b1a154a316ea";
fsType = "btrfs";
};
# fileSystems."/mnt/ntfs" = {
# device = "/dev/disk/by-uuid/c51b755c-24d3-11e6-a186-408d5c1ea148";
# fsType = "ntfs-3g";
# options = ["rw""uid=1000"];
# };
} }

View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
unstable = import unstable = import
(builtins.fetchTarball "channel:nixos-unstable") (builtins.fetchTarball "channel:nixos-unstable")
{ config = config.nixpkgs.config; }; { config = config.nixpkgs.config; };
in in
@ -10,13 +10,18 @@ in
# You can remove these applications if you don't use them. # You can remove these applications if you don't use them.
vim vim
neovim neovim
ngrok
fish fish
zsh zsh
curl curl
wget wget
ccache
appstream
neofetch neofetch
kitty kitty
discord
brave brave
simplescreenrecorder
webcord webcord
vscode vscode
tor-browser tor-browser
@ -29,13 +34,14 @@ in
nfs-utils nfs-utils
tldr tldr
btrfs-progs btrfs-progs
git-lfs
golangci-lint golangci-lint
golangci-lint-langserver golangci-lint-langserver
google-chrome google-chrome
# gvfs # gvfs
git git
ipmitool ipmitool
go #go
zig zig
slack slack
networkmanagerapplet networkmanagerapplet
@ -44,6 +50,10 @@ in
ldmtool ldmtool
kitty kitty
flatpak flatpak
flatpak-builder
noto-fonts-color-emoji
twemoji-color-font
#whatsapp-emoji-font
libcanberra-gtk3 libcanberra-gtk3
docker docker
docker-compose docker-compose
@ -58,9 +68,9 @@ in
libsForQt5.kate libsForQt5.kate
sublime sublime
tailscale tailscale
libcap libcap
gcc gcc
go unstable.go
telegram-desktop telegram-desktop
falkon falkon
firefox firefox
@ -76,6 +86,7 @@ in
bottles bottles
wine wine
wine64 wine64
appstream-glib
#peazip #peazip
_7zz _7zz
unrar unrar
@ -86,6 +97,7 @@ in
air air
tailwindcss tailwindcss
betterdiscord-installer betterdiscord-installer
rpi-imager
vesktop vesktop
vencord vencord
fastfetch fastfetch
@ -93,7 +105,6 @@ in
obs-studio obs-studio
lunarvim lunarvim
qbittorrent qbittorrent
godot_4
vlc vlc
python3 python3
gparted gparted
@ -107,7 +118,20 @@ in
lutris lutris
audacity audacity
tree tree
ldmtool
ntfs3g
exercism
cmake
glew
glfw
libGL
unityhub
cmake
SDL2
vulkan-loader
vulkan-tools
vulkan-headers
wayland-protocols
]; ];
} }

2
result
View File

@ -1 +1 @@
/nix/store/9cdrpkf8a3xc0hhfxg69yck6qsvihjfg-nixos-system-hypr-nix-24.05.4396.ae2fc9e0e42c /nix/store/0i3hvfxxm34xkdy9pzjf0yp4j5d92mnq-nixos-system-hypr-nix-24.05.4469.6e99f2a27d60