diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index c444c8f..ca2fa88 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ nix/result nix/nixos.qcow2 +nix_file.tar.gz diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf old mode 100644 new mode 100755 diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf old mode 100644 new mode 100755 diff --git a/nix/.disks.nix.swp b/nix/.disks.nix.swp new file mode 100644 index 0000000..60699fa Binary files /dev/null and b/nix/.disks.nix.swp differ diff --git a/nix/.sops.yaml b/nix/.sops.yaml index 18d75e4..a9d55d5 100644 --- a/nix/.sops.yaml +++ b/nix/.sops.yaml @@ -1,8 +1,10 @@ keys: - &doloro-desktop age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838 + - &doloro-doloro-desktop age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh creation_rules: - path_regex: secrets/.+\.(yaml|json|env|ini|bin)$ key_groups: - age: - *doloro-desktop + - *doloro-doloro-desktop diff --git a/nix/configuration.nix b/nix/configuration.nix index a9b3f8f..8b25c24 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -9,11 +9,20 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ./modules/greetd/nixos.nix + ./disks.nix ]; # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.enable = true; + boot.loader.grub.device = "nodev"; + boot.loader.grub.devices = ["/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F" + "nodev" +]; + #boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.efiSupport = true; + boot.loader.grub.efiInstallAsRemovable = true; + + nix.settings.experimental-features = ["flakes" "nix-command"]; # networking.hostName = "nixos"; # Define your hostname. @@ -50,6 +59,7 @@ # Enable the X11 windowing system. # services.xserver.enable = true; + programs.hyprland.enable = true; @@ -63,10 +73,10 @@ # Enable sound. # services.pulseaudio.enable = true; # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; + services.pipewire = { + enable = true; + pulse.enable = true; + }; # Enable touchpad support (enabled default in most desktopManager). # services.libinput.enable = true; @@ -79,7 +89,7 @@ ]; }; users.mutableUsers = false; - # users.users.doloro.hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; + users.users.doloro.hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; # users.users.root.hashedPasswordFile = config.sops.secrets."root-hashed_password".path; users.users.root.initialPassword = "root"; # programs.firefox.enable = true; diff --git a/nix/disks.nix b/nix/disks.nix index d0f0ed7..99d58e4 100644 --- a/nix/disks.nix +++ b/nix/disks.nix @@ -10,7 +10,7 @@ disko.devices = { disk = { main = { - device = lib.mkDefault "nvme-CT1000P2SSD8_2221E632CD1F"; + device = lib.mkDefault "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"; type = "disk"; content = { type = "gpt"; diff --git a/nix/flake.lock b/nix/flake.lock index 1b9c106..ca54e36 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -33,6 +33,27 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746728054, + "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "owner": "nix-community", + "repo": "disko", + "rev": "ff442f5d1425feb86344c028298548024f21256d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "latest", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -427,6 +448,7 @@ }, "root": { "inputs": { + "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", "nixpkgs": "nixpkgs_2", diff --git a/nix/flake.nix b/nix/flake.nix index 37a96c8..2f7fe6d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -21,7 +21,7 @@ url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; }; - +}; outputs = inputs@{ nixpkgs, home-manager, ... }: let @@ -43,6 +43,9 @@ # to pass through arguments to home.nix }; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs system; + }; modules = [ ./configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko ]; }; }; diff --git a/nix/home.nix b/nix/home.nix index 61259e5..0bc0155 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -11,7 +11,12 @@ # manage. home.username = "doloro"; home.homeDirectory = "/home/doloro"; - + + programs.git = { + enable = true; + userName = "doloro"; + userEmail = "doloro@proton.me"; + }; # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. diff --git a/nix/meow.txt b/nix/meow.txt new file mode 100644 index 0000000..ff26e3d --- /dev/null +++ b/nix/meow.txt @@ -0,0 +1 @@ +age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh diff --git a/nix/modules/hyprland/home.nix b/nix/modules/hyprland/home.nix index 4d2e439..f67c8c6 100644 --- a/nix/modules/hyprland/home.nix +++ b/nix/modules/hyprland/home.nix @@ -13,4 +13,5 @@ in package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; + programs.foot.enable = true; } diff --git a/nix/modules/hyprland/settings.nix b/nix/modules/hyprland/settings.nix index 9f04482..77e0341 100644 --- a/nix/modules/hyprland/settings.nix +++ b/nix/modules/hyprland/settings.nix @@ -84,7 +84,7 @@ }; "$mainMod" = "SUPER"; binds = [ - "$mainMod, Q, exec, $terminal" + "$mainMod, Q, exec, foot" "$mainMod, C, killactive," "$mainMod, M, exit," "$mainMod, E, exec, $fileManager" diff --git a/nix/nix.conf b/nix/nix.conf new file mode 100644 index 0000000..ec2211f --- /dev/null +++ b/nix/nix.conf @@ -0,0 +1,18 @@ +# WARNING: this file is generated from the nix.* options in +# your NixOS configuration, typically +# /etc/nixos/configuration.nix. Do not edit it! +allowed-users = * +auto-optimise-store = false +builders = +cores = 0 +max-jobs = auto +require-sigs = true +sandbox = true +sandbox-fallback = false +substituters = https://cache.nixos.org/ +system-features = nixos-test benchmark big-parallel kvm +trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= +trusted-substituters = +trusted-users = root nixos +extra-sandbox-paths = + diff --git a/nix/nvim b/nix/nvim deleted file mode 100644 index e69de29..0000000 diff --git a/nix/secrets/users.yaml b/nix/secrets/users.yaml index c78be4a..f452db9 100644 --- a/nix/secrets/users.yaml +++ b/nix/secrets/users.yaml @@ -5,11 +5,20 @@ sops: - recipient: age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJYU8wczhvZXVscnJiK1Q3 - WEdibmFLTHRjWmtoTXJmT1J1UFduaUJ6d2dvClZmNHZHYmpwZUR0MmVZeTBEZmxr - WE11TnlodmNqbEFwTUlPd1ZFc2tJTVkKLS0tIDZyMk5iZjFLWlpjOFZwTnNtcGpG - SUVwVjZ3MEhPRFJ0V25GYnNhL2ZSczQKHJbpKEyWBNnyBBXKHMz+WefSr/iMiCin - BftZDPEMaogAE+OIlSvTCDV5i8WMfPvt9laGI2pCNsPB/ke+WwXUUg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJektlZ3JVYmFqYS9Zd09Q + V1FVdTdVMjd2UUF5WHB5L2dOeXFlWml0cFNNCkduTVlwV0ZtTHg0cjV1N0hzeCto + Ym4xSVVERTdGcjRoUG5IcW42MmJTTm8KLS0tIHdXbkpzVFBzdUFQTjlDMVRBaG40 + UFV6dUVUM0gzQmFoT21qK0crdENiK2cKeNBxr8ac9X7BOhNqnOrnoPsBPdf56WwH + zltXIxMVEZcEL6ggU7on/swIhEZAW0uJyhfQiVzI4M1XvLBu+PiTqg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLckMvUGtVUU9Jb1lIOUE3 + UHdKZmVpcDBnSXZTTTB0ZER0VGRWUldmQkFNCkJTcVZEcjg4RXJlS08wcHpCZEoz + ZW9wU1JmVE5yeU5TVi8rTzFpOUNnUzQKLS0tIDI3OTdQZndkYWlycVhFY2RxNHhv + cDJzRjhUTzFmYVBUZ0NUSDV3MmZ1MWcKfSE7eQD0sh9Ag2S3TfYoUjH1772nGErX + P6GugohgWxQNXAptiyAzhAEys/2SHQ0lfI9tP2vfX0dQYPf1foGDDA== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-09-21T15:03:11Z" mac: ENC[AES256_GCM,data:8z442Ny6iTUXR/daGASDfwf7KfiQbVdMor1xwSakmcVk5gFCI3fxRyJKOMDfYxdPuxHLarDowm2VYy0ismlduxaMs/7nK05Ry0issEeHlt1SGWiHqnfcjTvaiVhgh7k43nUIDnY7Vxe6cumBGhyW1xSKH4B6jUweaZyjn9V/ZCk=,iv:YpRnYD/FDhreWQUBmx7bEWWPFgofWbHKo7CIO0obuiM=,tag:zxOBTfEP4GxMV2DrhvKTNA==,type:str] diff --git a/nvim/config/autosession.lua b/nvim/config/autosession.lua old mode 100644 new mode 100755 diff --git a/nvim/config/lazygit.lua b/nvim/config/lazygit.lua old mode 100644 new mode 100755 diff --git a/nvim/config/melange.lua b/nvim/config/melange.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.comment.lua b/nvim/config/mini.comment.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.completion.lua b/nvim/config/mini.completion.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.cursorword.lua b/nvim/config/mini.cursorword.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.notify.lua b/nvim/config/mini.notify.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.sessions.lua b/nvim/config/mini.sessions.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.starter.lua b/nvim/config/mini.starter.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.statusline.lua b/nvim/config/mini.statusline.lua old mode 100644 new mode 100755 diff --git a/nvim/config/mini.tabline.lua b/nvim/config/mini.tabline.lua old mode 100644 new mode 100755 diff --git a/nvim/config/nvim-tree.lua b/nvim/config/nvim-tree.lua old mode 100644 new mode 100755 diff --git a/nvim/config/presisted.lua b/nvim/config/presisted.lua old mode 100644 new mode 100755 diff --git a/nvim/config/sessions.lua b/nvim/config/sessions.lua old mode 100644 new mode 100755 diff --git a/nvim/config/telescope-filebrowser.lua b/nvim/config/telescope-filebrowser.lua old mode 100644 new mode 100755 diff --git a/nvim/config/telescope.lua b/nvim/config/telescope.lua old mode 100644 new mode 100755 diff --git a/nvim/config/wakatime.lua b/nvim/config/wakatime.lua old mode 100644 new mode 100755 diff --git a/nvim/init.lua b/nvim/init.lua old mode 100644 new mode 100755 diff --git a/nvim/init.lua.old b/nvim/init.lua.old old mode 100644 new mode 100755 diff --git a/nvim/lua/doloro/init.lua b/nvim/lua/doloro/init.lua old mode 100644 new mode 100755 diff --git a/nvim/lua/doloro/plugins.lua b/nvim/lua/doloro/plugins.lua old mode 100644 new mode 100755 diff --git a/quickshell/assets/bar/Mic.svg b/quickshell/assets/bar/Mic.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/bar/MutedMic.svg b/quickshell/assets/bar/MutedMic.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/bar/MutedSpeaker.svg b/quickshell/assets/bar/MutedSpeaker.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/bar/Speaker.svg b/quickshell/assets/bar/Speaker.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/media_player/pausebutton.svg b/quickshell/assets/media_player/pausebutton.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/media_player/playbutton.svg b/quickshell/assets/media_player/playbutton.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/media_player/skip_next.svg b/quickshell/assets/media_player/skip_next.svg old mode 100644 new mode 100755 diff --git a/quickshell/assets/media_player/skip_previous.svg b/quickshell/assets/media_player/skip_previous.svg old mode 100644 new mode 100755 diff --git a/quickshell/bar/Bar.qml b/quickshell/bar/Bar.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/Audio.qml b/quickshell/bar/widgets/Audio.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/SystemTray.qml b/quickshell/bar/widgets/SystemTray.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/Workspaces.qml b/quickshell/bar/widgets/Workspaces.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/clock/Clock.qml b/quickshell/bar/widgets/clock/Clock.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/clock/ClockData.qml b/quickshell/bar/widgets/clock/ClockData.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/clock/Date.qml b/quickshell/bar/widgets/clock/Date.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/Colors.qml b/quickshell/bar/widgets/common/Colors.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/Container.qml b/quickshell/bar/widgets/common/Container.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/Dot.qml b/quickshell/bar/widgets/common/Dot.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/Icons.qml b/quickshell/bar/widgets/common/Icons.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/MaterialIcon.qml b/quickshell/bar/widgets/common/MaterialIcon.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/Meow.qml b/quickshell/bar/widgets/common/Meow.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/VerticalSeprator.qml b/quickshell/bar/widgets/common/VerticalSeprator.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/common/text/StyledText.qml b/quickshell/bar/widgets/common/text/StyledText.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerController.qml b/quickshell/bar/widgets/player/PlayerController.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerControllerV2.qml b/quickshell/bar/widgets/player/PlayerControllerV2.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerPopup.qml b/quickshell/bar/widgets/player/PlayerPopup.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerPopupV2.qml b/quickshell/bar/widgets/player/PlayerPopupV2.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerWidget.qml b/quickshell/bar/widgets/player/PlayerWidget.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/player/PlayerWidgetV2.qml b/quickshell/bar/widgets/player/PlayerWidgetV2.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/workspace/HyprlandClient.qml b/quickshell/bar/widgets/workspace/HyprlandClient.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml b/quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml old mode 100644 new mode 100755 diff --git a/quickshell/bar/widgets/workspace/WorkspaceWidget.qml b/quickshell/bar/widgets/workspace/WorkspaceWidget.qml old mode 100644 new mode 100755 diff --git a/quickshell/shell.qml b/quickshell/shell.qml old mode 100644 new mode 100755 diff --git a/tmux/tmux.conf b/tmux/tmux.conf old mode 100644 new mode 100755