diff --git a/flake.lock b/flake.lock index 278f69f..26d7b3e 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -78,15 +94,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1677626247, - "narHash": "sha256-6Yh54fpH0jnomBDLPWTcKQSIdFXvnfc6sS0tPWNx1MY=", + "lastModified": 1676935051, + "narHash": "sha256-OC+mgw7enQRnAg90IDjQkEwUkMRa/Q5DntDGa9oC4PM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0e252d2c7770f712ed5395d75e31138abf0ea048", + "rev": "431c74f111285eab41c17d724f335a324b5c833a", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.22.0beta", "repo": "Hyprland", "type": "github" } @@ -138,11 +155,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1677570356, - "narHash": "sha256-KbXK9ByJtuuO+NG/QOl5ULvSktqLq0IAF6DJjsgOO/Y=", + "lastModified": 1677635785, + "narHash": "sha256-38Gk7Sdhm7Luec+1bcDeg0awq4zOSOVl2EdXN4Hqik0=", "owner": "neovim", "repo": "neovim", - "rev": "8acb3d742ce68adadf1def9e1d1bb5bfd671988c", + "rev": "aa840ab5668aa9bc013461a48da771f778b39e49", "type": "github" }, "original": { @@ -159,11 +176,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1677572160, - "narHash": "sha256-DEEwY6si6ZNVAQePpNUooMTOH/mRe04XVqtTlYCWiE8=", + "lastModified": 1677658555, + "narHash": "sha256-59ucL5p0MvIgl6ot4+OJi6FFDoKppetsmFqwV5pvA+4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4b2773ee687616104855a759a71591f875c29414", + "rev": "427fbeb38fb2f9a4a48a7078498f1d668ba561d6", "type": "github" }, "original": { @@ -193,11 +210,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677468890, - "narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", + "lastModified": 1677560409, + "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f19c04354dec3903f614eae09327a04d297835d", + "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070", "type": "github" }, "original": { @@ -224,27 +241,39 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1677407201, - "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", - "owner": "nixos", + "lastModified": 0, + "narHash": "sha256-/+H7WC/UFwZSq+0fFskDNPOvvHFEK1ZvLt+e6JwxeD0=", + "path": "/home/zoriya/projects/nixpkgs", + "type": "path" + }, + "original": { + "path": "/home/zoriya/projects/nixpkgs", + "type": "path" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1670543317, + "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", + "rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1677620771, - "narHash": "sha256-1APWgJwUewZcTYjC3Ih1bA1P/Oese4vsKc4wu8vv42w=", + "lastModified": 1677682142, + "narHash": "sha256-ix4/A8cRCjKlnRBE9zMXcw53BprTwcmZK7mIhBVunHc=", "owner": "nix-community", "repo": "NUR", - "rev": "471f23c2b9cbfaf0384cc0e456cc27823e30ba09", + "rev": "e2144c92d40e82258b37be8928471f4583a8cbc3", "type": "github" }, "original": { @@ -261,7 +290,27 @@ "neovim-nightly": "neovim-nightly", "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_2", - "nur": "nur" + "nur": "nur", + "tuxedo-nixos": "tuxedo-nixos" + } + }, + "tuxedo-nixos": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1673253770, + "narHash": "sha256-rAnkAxSEkue7iAoo/ddLF5NXBBFEQ1zPOZ4KirsOTYM=", + "owner": "blitz", + "repo": "tuxedo-nixos", + "rev": "33ddfa2fd889348ed0f44b18463eb5a3135a521a", + "type": "github" + }, + "original": { + "owner": "blitz", + "repo": "tuxedo-nixos", + "type": "github" } }, "utils": { diff --git a/flake.nix b/flake.nix index 19dc706..f4fde84 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,13 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:zoriya/nixpkgs/nixos-unstable"; #"github:zoriya/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/Hyprland"; + url = "github:hyprwm/Hyprland/v0.22.0beta"; inputs.nixpkgs.follows = "nixpkgs"; }; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; @@ -18,6 +18,9 @@ url = "github:reegnz/jq-zsh-plugin"; flake = false; }; + tuxedo-nixos = { + url = "github:blitz/tuxedo-nixos"; + }; }; outputs = { @@ -26,6 +29,7 @@ hyprland, neovim-nightly, nur, + tuxedo-nixos, ... } @ rawInput: let user = "zoriya"; @@ -99,6 +103,13 @@ virtualisation.docker.enable = true; environment.systemPackages = with pkgs; [docker-compose]; }) + + tuxedo-nixos.nixosModules.default + ({lib, ...}: { + hardware.tuxedo-keyboard.enable = true; + hardware.tuxedo-control-center.enable = true; + # hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default; + }) ]; }; in { diff --git a/modules/home/eww/bar/language/eww.yuck b/modules/home/eww/bar/language/eww.yuck index 95b6c30..f471ff5 100644 --- a/modules/home/eww/bar/language/eww.yuck +++ b/modules/home/eww/bar/language/eww.yuck @@ -1,4 +1,4 @@ -(defpoll lang :interval "1s" "./bar/language/language.sh") +(defpoll lang :interval "1s" :initial "en" "./bar/language/language.sh") (defwidget language [] (box :class "module floating" diff --git a/modules/home/eww/bar/language/language.sh b/modules/home/eww/bar/language/language.sh index 0448740..510c8d0 100755 --- a/modules/home/eww/bar/language/language.sh +++ b/modules/home/eww/bar/language/language.sh @@ -8,7 +8,8 @@ current() { --dest=org.fcitx.Fcitx5 \ /controller \ org.fcitx.Fcitx.Controller1.CurrentInputMethod \ - | grep -Po '(?<=")[^"]+' + | grep -Po '(?<=")[^"]+' \ + || echo "en" } # List all input methods added to Fcitx diff --git a/modules/home/fcitx5/default.nix b/modules/home/fcitx5/default.nix index 4989dca..0e5881b 100644 --- a/modules/home/fcitx5/default.nix +++ b/modules/home/fcitx5/default.nix @@ -19,31 +19,37 @@ in { }; }; - xdg.configFile."fcitx5/config".text = '' - [Hotkey/TriggerKeys] - 0=Super+Shift+L + xdg.configFile."fcitx5/config" = { + force = true; + text = '' + [Hotkey/TriggerKeys] + 0=Shift+Super+L - [Behavior] - ShowInputMethodInformation=False - CompactInputMethodInformation=False - ShowFirstInputMethodInformation=False - ''; - xdg.configFile."fcitx5/profile".text = '' - [Groups/0] - Name=Default - Default Layout=us - DefaultIM=mozc - - [Groups/0/Items/0] - Name=keyboard-us - Layout= - - [Groups/0/Items/1] - Name=mozc - Layout= - - [GroupOrder] - 0=Default + [Behavior] + ShowInputMethodInformation=False + CompactInputMethodInformation=False + ShowFirstInputMethodInformation=False + ''; + }; + xdg.configFile."fcitx5/profile" = { + force = true; + text = '' + [Groups/0] + Name=Default + Default Layout=us + DefaultIM=mozc + + [Groups/0/Items/0] + Name=keyboard-us + Layout= + + [Groups/0/Items/1] + Name=mozc + Layout= + + [GroupOrder] + 0=Default ''; + }; }; } diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix index fc7673e..83377e4 100644 --- a/modules/home/git/default.nix +++ b/modules/home/git/default.nix @@ -25,6 +25,7 @@ in { gpg.format = "ssh"; gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers"; push.autoSetupRemote = true; + init.defaultBranch = "master"; }; userEmail = "zoe.roux@zoriya.dev"; diff --git a/modules/home/hyprland/hyprland.conf b/modules/home/hyprland/hyprland.conf index 59a51ac..c39b92f 100644 --- a/modules/home/hyprland/hyprland.conf +++ b/modules/home/hyprland/hyprland.conf @@ -5,7 +5,7 @@ exec-once=fusuma -c /home/zoriya/.config/fusuma/config.yaml exec-once=swayidle -w timeout 1200 lock before-sleep lock exec-once=/home/zoriya/.config/hypr/wallpaper.sh init exec-once=kitty --class=scratchpad -exec-once=fcitx5 -d +#exec-once=fcitx5 -d # TAKEN CARE BY SYSTEMD exec-once = wl-paste --type text --watch cliphist store autogenerated = 0 diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index c50e700..55057a1 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -3,14 +3,13 @@ cfg = config.games; in { options.games = { enable = lib.mkEnableOption "games"; }; config = lib.mkIf cfg.enable { - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + services.flatpak.enable = true; - environment.systemPackages = with pkgs; [ - steam-run - ]; - }; + hardware.opengl.driSupport32Bit = true; + environment.systemPackages = with pkgs; [ + wineWowPackages.stable + wineWowPackages.waylandFull + winetricks + ]; }; } diff --git a/modules/nixos/wayland/default.nix b/modules/nixos/wayland/default.nix index 1b12d71..9bfaf93 100644 --- a/modules/nixos/wayland/default.nix +++ b/modules/nixos/wayland/default.nix @@ -12,11 +12,17 @@ in { services.printing.enable = true; security.rtkit.enable = true; security.polkit.enable = true; + # services.audio = { + # enable = true; + # }; + # hardware.pulseaudio.enable = true; + # hardware.pulseaudio.support32Bit = true; services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + wireplumber.enable = true; }; # Autostart hyprland and display lockscreen as greeter diff --git a/wallpapers/board_games_by_klegs_dduamhd.jpg b/wallpapers/board_games_by_klegs_dduamhd.jpg new file mode 100644 index 0000000..a7ef1f4 Binary files /dev/null and b/wallpapers/board_games_by_klegs_dduamhd.jpg differ diff --git a/wallpapers/contrasts_by_klegs_de27eem.jpg b/wallpapers/contrasts_by_klegs_de27eem.jpg new file mode 100644 index 0000000..074ebbb Binary files /dev/null and b/wallpapers/contrasts_by_klegs_de27eem.jpg differ diff --git a/wallpapers/wondering_by_klegs_ddxqdc1.jpg b/wallpapers/wondering_by_klegs_ddxqdc1.jpg new file mode 100644 index 0000000..c33ee85 Binary files /dev/null and b/wallpapers/wondering_by_klegs_ddxqdc1.jpg differ diff --git a/wallpapers/worm.png b/wallpapers/worm.png new file mode 100644 index 0000000..ef57869 Binary files /dev/null and b/wallpapers/worm.png differ